Avoid reserved identifiers

Change-Id: I63ab4de02702c6f74caa3a65f7d297e2a95a65cd

4 files changed, 14 insertions, 14 deletions

diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index ebf855ec092f..34643638f2cc 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -72,8 +72,8 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
     SdrModel*       mpModel;
     SdrView*        mpView;
 
-    void    _SelectObjectsInView( const css::uno::Reference< css::drawing::XShapes >& aShapes, SdrPageView*   pPageView ) throw ();
-    void    _SelectObjectInView( const css::uno::Reference< css::drawing::XShape >& xShape, SdrPageView*  pPageView ) throw();
+    void    SelectObjectsInView( const css::uno::Reference< css::drawing::XShapes >& aShapes, SdrPageView*   pPageView ) throw ();
+    void    SelectObjectInView( const css::uno::Reference< css::drawing::XShape >& xShape, SdrPageView*  pPageView ) throw();
 
     virtual void disposing() throw();
 
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f7f1ecca7402..83826053ddbe 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1623,7 +1623,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc
 
     SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
 
-    _SelectObjectsInView( xShapes, pPageView );
+    SelectObjectsInView( xShapes, pPageView );
 
     mpView->CombineMarkedObjects( false );
 
@@ -1654,7 +1654,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro
         return;
 
     SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
-    _SelectObjectInView( xGroup, pPageView );
+    SelectObjectInView( xGroup, pPageView );
     mpView->DismantleMarkedObjects();
     mpView->HideSdrPage();
 
@@ -1674,7 +1674,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference<
 
     SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
 
-    _SelectObjectsInView( xShapes, pPageView );
+    SelectObjectsInView( xShapes, pPageView );
 
     mpView->CombineMarkedObjects();
 
@@ -1705,7 +1705,7 @@ void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xSh
         return;
 
     SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
-    _SelectObjectInView( xShape, pPageView );
+    SelectObjectInView( xShape, pPageView );
     mpView->DismantleMarkedObjects( true );
     mpView->HideSdrPage();
 
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 6fbab3e9b2e2..cdc5c17a7b4e 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -390,9 +390,9 @@ namespace
     }
 }
 
-// ATTENTION: _SelectObjectsInView selects the css::drawing::Shapes
+// ATTENTION: SelectObjectsInView selects the css::drawing::Shapes
 // only in the given SdrPageView. It hasn't to be the visible SdrPageView.
-void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
+void SvxDrawPage::SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
 {
     SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
     SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
@@ -412,9 +412,9 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS
     }
 }
 
-// ATTENTION: _SelectObjectInView selects the shape only in the given SdrPageView.
+// ATTENTION: SelectObjectInView selects the shape only in the given SdrPageView.
 // It hasn't to be the visible SdrPageView.
-void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
+void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
 {
     SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
     SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
@@ -443,7 +443,7 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
 
     SdrPageView* pPageView = mpView->ShowSdrPage( mpPage );
 
-    _SelectObjectsInView( xShapes, pPageView );
+    SelectObjectsInView( xShapes, pPageView );
 
     mpView->GroupMarked();
 
@@ -481,7 +481,7 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
     SdrPageView* pPageView = mpView->ShowSdrPage( mpPage );
 
     Reference< drawing::XShape > xShape( aGroup, UNO_QUERY );
-    _SelectObjectInView( xShape, pPageView );
+    SelectObjectInView( xShape, pPageView );
     mpView->UnGroupMarked();
 
     mpView->HideSdrPage();
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 0d3d94926228..fa52bebce2bc 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -251,7 +251,7 @@ SwFmDrawPage::~SwFmDrawPage() throw ()
 
 const SdrMarkList&  SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShapes > & xShapes)
 {
-    _SelectObjectsInView( xShapes, GetPageView() );
+    SelectObjectsInView( xShapes, GetPageView() );
     const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
     return rMarkList;
 }
@@ -259,7 +259,7 @@ const SdrMarkList&  SwFmDrawPage::PreGroup(const uno::Reference< drawing::XShape
 void SwFmDrawPage::PreUnGroup(const uno::Reference< drawing::XShapeGroup >&  rShapeGroup)
 {
     uno::Reference< drawing::XShape >  xShape( rShapeGroup, uno::UNO_QUERY);
-    _SelectObjectInView( xShape, GetPageView() );
+    SelectObjectInView( xShape, GetPageView() );
 }
 
 SdrPageView*    SwFmDrawPage::GetPageView()