[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - sd/source

[Norbert Thiebaud]

 sd/source/ui/dlg/navigatr.cxx |    6 +++++-
 sd/source/ui/dlg/tpaction.cxx |    6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 8f32ab6fafd24d3f5c60bf0d043f8254cc27a846
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Jan 12 09:11:06 2011 -0600

    deliver sfx2/sfxresid.hxx

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index b3e97fd..67975b2 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -45,6 +45,7 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dockwin.hxx>
+#include <sfx2/sfxresid.hxx>
 
 #include "pres.hxx"
 #include "navigatr.hxx"
@@ -315,7 +316,10 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
                 USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID );
                 if( nRId > 0 )
                 {
-                    pMenu->InsertItem( nID, String( SdResId( nRId ) ) );
+                    if (nID==STR_NONE)
+                        pMenu->InsertItem( nID, String( SfxResId( nRId ) ) );
+                    else
+                        pMenu->InsertItem( nID, String( SdResId( nRId ) ) );
                     pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 +
                                             nID - NAVIGATOR_DRAGTYPE_URL );
                 }
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 9aba5fe..5a5fae5 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -33,7 +33,7 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 
-#include <svx/svxids.hrc>  
+#include <svx/svxids.hrc>
 #include <com/sun/star/presentation/AnimationEffect.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <com/sun/star/presentation/AnimationSpeed.hpp>
@@ -45,7 +45,7 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 
 #include "sdattr.hxx"
-
+#include <sfx2/sfxresid.hxx>
 
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
@@ -488,7 +488,7 @@ void SdTPAction::OpenFileDialog()
             // filter makes the (Windows system) open file dialog follow
             // links on the desktop to directories.
             aFileDialog.AddFilter (
-                String (SdResId (STR_SFX_FILTERNAME_ALL)),
+                String (SfxResId (STR_SFX_FILTERNAME_ALL)),
                 String (RTL_CONSTASCII_USTRINGPARAM("*.*")));