[Libreoffice-commits] .: 2 commits - sd/source sw/source tools/inc tools/source vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue May 22 04:49:29 PDT 2012
sd/source/ui/annotations/annotationwindow.cxx | 8 +++-----
sd/source/ui/annotations/annotationwindow.hxx | 2 +-
sd/source/ui/inc/Window.hxx | 2 +-
sd/source/ui/view/sdwindow.cxx | 11 +++--------
sw/source/ui/docvw/SidebarTxtControl.cxx | 7 +++----
sw/source/ui/docvw/SidebarTxtControl.hxx | 2 +-
sw/source/ui/docvw/edtwin.cxx | 2 +-
sw/source/ui/inc/edtwin.hxx | 2 +-
tools/inc/tools/config.hxx | 2 +-
tools/inc/tools/simplerm.hxx | 2 +-
tools/source/generic/config.cxx | 12 ++++++------
tools/source/rc/resmgr.cxx | 2 +-
vcl/inc/vcl/edit.hxx | 2 +-
vcl/inc/vcl/window.hxx | 2 +-
vcl/source/control/edit.cxx | 7 +++----
vcl/source/window/window.cxx | 4 ++--
16 files changed, 30 insertions(+), 39 deletions(-)
New commits:
commit ae167f81e68fc05693f195fa9a680071b741dcbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 20 21:15:20 2012 +0100
convert GetSurroundingText family to OUString
Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d6bc917..34950f9 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -242,7 +242,7 @@ void AnnotationTextWindow::LoseFocus()
Window::LoseFocus();
}
-XubString AnnotationTextWindow::GetSurroundingText() const
+rtl::OUString AnnotationTextWindow::GetSurroundingText() const
{
if( mpOutlinerView )
{
@@ -252,12 +252,10 @@ XubString AnnotationTextWindow::GetSurroundingText() const
else
{
ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
- XubString aStr = aEditEngine->GetText(aSelection.nStartPara);
- return aStr;
+ return aEditEngine->GetText(aSelection.nStartPara);
}
}
- else
- return XubString::EmptyString();
+ return rtl::OUString();
}
Selection AnnotationTextWindow::GetSurroundingTextSelection() const
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 777b78c..da49c76 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -78,7 +78,7 @@ public:
void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; }
- virtual XubString GetSurroundingText() const;
+ virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
virtual void GetFocus();
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 1842903..367822f 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -209,7 +209,7 @@ protected:
::com::sun::star::accessibility::XAccessible>
CreateAccessible (void);
- XubString GetSurroundingText() const;
+ rtl::OUString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const;
};
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 0590702..f070b10 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1179,21 +1179,16 @@ void Window::DropScroll(const Point& rMousePos)
}
}
-XubString Window::GetSurroundingText() const
+rtl::OUString Window::GetSurroundingText() const
{
if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
- {
- return XubString();
- }
+ return rtl::OUString();
else if ( mpViewShell->GetView()->IsTextEdit() )
{
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingText();
}
- else
- {
- return XubString();
- }
+ return rtl::OUString();
}
Selection Window::GetSurroundingTextSelection() const
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 95cc889..b26b1b3 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -392,12 +392,11 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
}
}
-XubString SidebarTxtControl::GetSurroundingText() const
+rtl::OUString SidebarTxtControl::GetSurroundingText() const
{
- if( GetTextView() )
+ if (GetTextView())
return GetTextView()->GetSurroundingText();
- else
- return XubString::EmptyString();
+ return rtl::OUString();
}
Selection SidebarTxtControl::GetSurroundingTextSelection() const
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index e536cee..e3d3742 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -58,7 +58,7 @@ class SidebarTxtControl : public Control
virtual void Command( const CommandEvent& rCEvt );
virtual void LoseFocus();
virtual void RequestHelp(const HelpEvent &rEvt);
- virtual XubString GetSurroundingText() const;
+ virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
DECL_LINK( Select, Menu* );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e6ae678..6d5cc4f 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5717,7 +5717,7 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
bUseInputLanguage = bNew;
}
-XubString SwEditWin::GetSurroundingText() const
+rtl::OUString SwEditWin::GetSurroundingText() const
{
String sReturn;
SwWrtShell& rSh = rView.GetWrtShell();
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 45bc277..ac78de9 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -221,7 +221,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual XubString GetSurroundingText() const;
+ virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg,
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 9ca82bd..359b9d7 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -246,7 +246,7 @@ public:
static PopupMenu* CreatePopupMenu();
static void DeletePopupMenu( PopupMenu* pMenu );
- virtual XubString GetSurroundingText() const;
+ virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
// returns the minimum size a bordered Edit should have given the current
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 881522f..94a3fbe 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1089,7 +1089,7 @@ public:
void SimulateKeyPress( sal_uInt16 nKeyCode ) const;
- virtual XubString GetSurroundingText() const;
+ virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
// ExtImpl
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 128d7db..534b813 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -3147,11 +3147,10 @@ void ImplSubEdit::Modify()
GetParent()->Modify();
}
-XubString Edit::GetSurroundingText() const
+rtl::OUString Edit::GetSurroundingText() const
{
- if ( mpSubEdit )
- return mpSubEdit->GetSurroundingText();
- else
+ if (mpSubEdit)
+ return mpSubEdit->GetSurroundingText();
return maText;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a71dda2..ee6c4a5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9579,9 +9579,9 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
SetParent( pRealParent );
}
-XubString Window::GetSurroundingText() const
+rtl::OUString Window::GetSurroundingText() const
{
- return XubString::EmptyString();
+ return rtl::OUString();
}
Selection Window::GetSurroundingTextSelection() const
commit a22a7923c05df85a1f9c9435754c5feda66ce576
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 19 10:39:40 2012 +0100
ditch some XubStrings
Change-Id: I00e1202de7bf5d20b4ac314dd138a3bb486245cb
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index a401118..d2f609c 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -56,7 +56,7 @@ private:
#endif
public:
- Config( const XubString& rFileName );
+ Config( const rtl::OUString& rFileName );
~Config();
const rtl::OUString& GetPathName() const { return maFileName; }
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index cee100f..7e2a7d3 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -78,7 +78,7 @@ public:
an existent string
@seealso IsAvailable
*/
- UniString ReadString( sal_uInt32 nId );
+ rtl::OUString ReadString( sal_uInt32 nId );
/** checks whether a certain resource is availble
@param _resourceType
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 767e17a..91c0193 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -68,7 +68,7 @@ struct ImplGroupData
struct ImplConfigData
{
ImplGroupData* mpFirstGroup;
- XubString maFileName;
+ rtl::OUString maFileName;
sal_uIntPtr mnDataUpdateId;
sal_uIntPtr mnTimeStamp;
LineEnd meLineEnd;
@@ -93,7 +93,7 @@ static String toUncPath( const String& rPath )
return aFileURL;
}
-static sal_uIntPtr ImplSysGetConfigTimeStamp( const XubString& rFileName )
+static sal_uIntPtr ImplSysGetConfigTimeStamp( const rtl::OUString& rFileName )
{
sal_uIntPtr nTimeStamp = 0;
::osl::DirectoryItem aItem;
@@ -110,7 +110,7 @@ static sal_uIntPtr ImplSysGetConfigTimeStamp( const XubString& rFileName )
// -----------------------------------------------------------------------
-static sal_uInt8* ImplSysReadConfig( const XubString& rFileName,
+static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName,
sal_uInt64& rRead, sal_Bool& rbRead, sal_Bool& rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
{
sal_uInt8* pBuf = NULL;
@@ -156,7 +156,7 @@ static sal_uInt8* ImplSysReadConfig( const XubString& rFileName,
// -----------------------------------------------------------------------
-static sal_Bool ImplSysWriteConfig( const XubString& rFileName,
+static sal_Bool ImplSysWriteConfig( const rtl::OUString& rFileName,
const sal_uInt8* pBuf, sal_uIntPtr nBufLen, sal_Bool rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
{
sal_Bool bSuccess = sal_False;
@@ -626,7 +626,7 @@ static void ImplDeleteConfigData( ImplConfigData* pData )
// =======================================================================
-static ImplConfigData* ImplGetConfigData( const XubString& rFileName )
+static ImplConfigData* ImplGetConfigData( const rtl::OUString& rFileName )
{
ImplConfigData* pData;
@@ -710,7 +710,7 @@ ImplGroupData* Config::ImplGetGroup() const
// =======================================================================
-Config::Config( const XubString& rFileName )
+Config::Config( const rtl::OUString& rFileName )
{
// Daten initialisieren und einlesen
maFileName = toUncPath( rFileName );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 2c315f1..977f043 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1946,7 +1946,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc
}
// -----------------------------------------------------------------------
-UniString SimpleResMgr::ReadString( sal_uInt32 nId )
+rtl::OUString SimpleResMgr::ReadString( sal_uInt32 nId )
{
osl::MutexGuard aGuard(m_aAccessSafety);
More information about the Libreoffice-commits
mailing list