mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert GetSurroundingText family to OUString

Browse Source 
Change-Id: Ifbb21fc26eedfde4afe2e3faf637346554f63d94
This commit is contained in:
Caolán McNamara
2012-05-20 21:15:20 +01:00
parent a22a7923c0
commit ae167f81e6
12 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sd/source/ui/annotations/annotationwindow.cxx
View File

@@ -242,7 +242,7 @@ void AnnotationTextWindow::LoseFocus()
Window::LoseFocus(); Window::LoseFocus();
} }
XubString AnnotationTextWindow::GetSurroundingText() const rtl::OUString AnnotationTextWindow::GetSurroundingText() const
{ {
if( mpOutlinerView ) if( mpOutlinerView )
{ {
@@ -252,12 +252,10 @@ XubString AnnotationTextWindow::GetSurroundingText() const
else else
{ {
ESelection aSelection = mpOutlinerView->GetEditView().GetSelection(); ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
XubString aStr = aEditEngine->GetText(aSelection.nStartPara); return aEditEngine->GetText(aSelection.nStartPara);
return aStr;
} }
} }
else return rtl::OUString();
return XubString::EmptyString();
} }
Selection AnnotationTextWindow::GetSurroundingTextSelection() const Selection AnnotationTextWindow::GetSurroundingTextSelection() const

2
sd/source/ui/annotations/annotationwindow.hxx
View File

@@ -78,7 +78,7 @@ public:
void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; }
virtual XubString GetSurroundingText() const; virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const; virtual Selection GetSurroundingTextSelection() const;
virtual void GetFocus(); virtual void GetFocus();

2
sd/source/ui/inc/Window.hxx
View File

@@ -209,7 +209,7 @@ protected:
::com::sun::star::accessibility::XAccessible> ::com::sun::star::accessibility::XAccessible>
CreateAccessible (void); CreateAccessible (void);
XubString GetSurroundingText() const; rtl::OUString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const; Selection GetSurroundingTextSelection() const;
}; };

11
sd/source/ui/view/sdwindow.cxx
View File

@@ -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 ) if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
{ return rtl::OUString();
return XubString();
}
else if ( mpViewShell->GetView()->IsTextEdit() ) else if ( mpViewShell->GetView()->IsTextEdit() )
{ {
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingText(); return pOLV->GetEditView().GetSurroundingText();
} }
else return rtl::OUString();
{
return XubString();
}
} }
Selection Window::GetSurroundingTextSelection() const Selection Window::GetSurroundingTextSelection() const

7
sw/source/ui/docvw/SidebarTxtControl.cxx
View File

@@ -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(); return GetTextView()->GetSurroundingText();
else return rtl::OUString();
return XubString::EmptyString();
} }
Selection SidebarTxtControl::GetSurroundingTextSelection() const Selection SidebarTxtControl::GetSurroundingTextSelection() const

2
sw/source/ui/docvw/SidebarTxtControl.hxx
View File

@@ -58,7 +58,7 @@ class SidebarTxtControl : public Control
virtual void Command( const CommandEvent& rCEvt ); virtual void Command( const CommandEvent& rCEvt );
virtual void LoseFocus(); virtual void LoseFocus();
virtual void RequestHelp(const HelpEvent &rEvt); virtual void RequestHelp(const HelpEvent &rEvt);
virtual XubString GetSurroundingText() const; virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const; virtual Selection GetSurroundingTextSelection() const;
DECL_LINK( Select, Menu* ); DECL_LINK( Select, Menu* );

2
sw/source/ui/docvw/edtwin.cxx
View File

@@ -5717,7 +5717,7 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
bUseInputLanguage = bNew; bUseInputLanguage = bNew;
} }
XubString SwEditWin::GetSurroundingText() const rtl::OUString SwEditWin::GetSurroundingText() const
{ {
String sReturn; String sReturn;
SwWrtShell& rSh = rView.GetWrtShell(); SwWrtShell& rSh = rView.GetWrtShell();

2
sw/source/ui/inc/edtwin.hxx
View File

@@ -221,7 +221,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
virtual XubString GetSurroundingText() const; virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const; virtual Selection GetSurroundingTextSelection() const;
void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg, void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg,

2
vcl/inc/vcl/edit.hxx
View File

@@ -246,7 +246,7 @@ public:
static PopupMenu* CreatePopupMenu(); static PopupMenu* CreatePopupMenu();
static void DeletePopupMenu( PopupMenu* pMenu ); static void DeletePopupMenu( PopupMenu* pMenu );
virtual XubString GetSurroundingText() const; virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const; virtual Selection GetSurroundingTextSelection() const;
// returns the minimum size a bordered Edit should have given the current // returns the minimum size a bordered Edit should have given the current

2
vcl/inc/vcl/window.hxx
View File

@@ -1089,7 +1089,7 @@ public:
void SimulateKeyPress( sal_uInt16 nKeyCode ) const; void SimulateKeyPress( sal_uInt16 nKeyCode ) const;
virtual XubString GetSurroundingText() const; virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const; virtual Selection GetSurroundingTextSelection() const;
// ExtImpl // ExtImpl

7
vcl/source/control/edit.cxx
View File

@@ -3147,11 +3147,10 @@ void ImplSubEdit::Modify()
GetParent()->Modify(); GetParent()->Modify();
} }
XubString Edit::GetSurroundingText() const rtl::OUString Edit::GetSurroundingText() const
{ {
if ( mpSubEdit ) if (mpSubEdit)
return mpSubEdit->GetSurroundingText(); return mpSubEdit->GetSurroundingText();
else
return maText; return maText;
} }

4
vcl/source/window/window.cxx
View File

@@ -9579,9 +9579,9 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
SetParent( pRealParent ); SetParent( pRealParent );
} }
XubString Window::GetSurroundingText() const rtl::OUString Window::GetSurroundingText() const
{ {
return XubString::EmptyString(); return rtl::OUString();
} }
Selection Window::GetSurroundingTextSelection() const Selection Window::GetSurroundingTextSelection() const