cws tl74: merge with DEV300 m76

4 files changed, 22 insertions, 13 deletions

diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8923ca6776..9d6644f5fb 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -511,8 +511,17 @@ void Svx3DLightControl::TrySelection(Point aPosPixel)
 
         if(aResult.size())
         {
-            // take the frontmost one
-            const E3dCompoundObject* pResult = aResult[0];
+            // exclude expansion object which will be part of
+            // the hits. It's invisible, but for HitTest, it's included
+            const E3dCompoundObject* pResult = 0;
+            
+            for(sal_uInt32 b(0); !pResult && b < aResult.size(); b++)
+            {
+                if(aResult[b] && aResult[b] != mpExpansionObject)
+                {
+                    pResult = aResult[b];
+                }
+            }
 
             if(pResult == mp3DObj)
             {
@@ -777,8 +786,8 @@ void Svx3DLightControl::GetPosition(double& rHor, double& rVer)
     }
     if(IsGeometrySelected())
     {
-        rHor = mfRotateY;
-        rVer = mfRotateX;
+        rHor = mfRotateY / F_PI180; // 0..360.0
+        rVer = mfRotateX / F_PI180; // -90.0..90.0
     }
 }
 
@@ -821,8 +830,8 @@ void Svx3DLightControl::SetPosition(double fHor, double fVer)
     {
         if(mfRotateX != fVer || mfRotateY != fHor)
         {
-            mfRotateX = fVer;
-            mfRotateY = fHor;
+            mfRotateX = fVer * F_PI180;
+            mfRotateY = fHor * F_PI180;
 
             if(mp3DObj)
             {
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index 082c4a9651..985e2e4b9b 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -482,7 +482,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
     if (pVwFrm)	// Alle moeglichen Target Frames zusammensammeln und anzeigen
     {
         TargetList aList;
-        pVwFrm->GetTopFrame()->GetTargetList(aList);
+        pVwFrm->GetTopFrame().GetTargetList(aList);
 
         USHORT nCount = (USHORT)aList.Count();
         if( nCount )
@@ -960,7 +960,7 @@ void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
 
     if ( pViewFrame )
     {
-        SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? pViewFrame->GetFrame() : NULL );
+        SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL );
         if ( pDisp )
             pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                             &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer, &aExternal, 0L );
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index ebe71cf370..e152afc2b9 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -321,7 +321,7 @@ void SvxRubyDialog::Activate()
     aStylistPB.Enable(bEnable);
     //get selection from current view frame
     SfxViewFrame* pCurFrm = SfxViewFrame::Current();
-    Reference< XController > xCtrl = pCurFrm->GetFrame()->GetController();
+    Reference< XController > xCtrl = pCurFrm->GetFrame().GetController();
     pImpl->SetController(xCtrl);
     if(pImpl->HasSelectionChanged())
     {
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index feba788b1c..f00a6c8093 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -237,7 +237,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     {
         Pos = MAP_APPFONT ( 12 , 163 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
-        Text [ en-US ] = "Current selection ~only" ;
+        Text [ en-US ] = "C~urrent selection only" ;
         TabStop = TRUE ;
         Hide = TRUE ;
     };
@@ -346,7 +346,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     {
         Pos = MAP_APPFONT ( 12 , 285 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "~Search in" ;
+        Text [ en-US ] = "Search i~n" ;
         Hide = TRUE ;
     };
     ListBox LB_CALC_SEARCHIN
@@ -368,7 +368,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     {
         Pos = MAP_APPFONT ( 12 , 300 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "~Search direction" ;
+        Text [ en-US ] = "Search ~direction" ;
         Hide = TRUE ;
     };
     RadioButton RB_CALC_ROWS
@@ -382,7 +382,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     {
         Pos = MAP_APPFONT ( 75 , 313 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
-        Text [ en-US ] = "Col~umns" ;
+        Text [ en-US ] = "Colu~mns" ;
         Hide = TRUE ;
     };
     CheckBox CB_ALL_SHEETS