summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/draw/dcontact.cxx2
-rw-r--r--sw/source/core/edit/edlingu.cxx16
-rw-r--r--sw/source/core/frmedt/feshview.cxx4
-rw-r--r--sw/source/core/unocore/unodraw.cxx4
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx2
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx2
-rw-r--r--sw/source/uibase/inc/SwSpellDialogChildWindow.hxx4
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.cxx6
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx6
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.cxx6
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.hxx4
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx8
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx16
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx6
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx4
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx2
-rw-r--r--sw/source/uibase/uno/unodispatch.cxx14
20 files changed, 58 insertions, 58 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index dcf788a7b3a7..b0fe5b69c8a3 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1484,7 +1484,7 @@ void SwDrawContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
{
// --> #i102752#
// assure that a ShapePropertyChangeNotifier exists
- maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( ::svx::eTextShapeAnchorType );
+ maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( svx::eTextShapeAnchorType );
}
}
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 06dae1436a9c..edd5d3217845 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -110,7 +110,7 @@ typedef std::vector<SpellContentPosition> SpellContentPositions;
class SwSpellIter : public SwLinguIter
{
uno::Reference< XSpellChecker1 > xSpeller;
- ::svx::SpellPortions aLastPortions;
+ svx::SpellPortions aLastPortions;
SpellContentPositions aLastPositions;
bool bBackToStartOfSentence;
@@ -131,9 +131,9 @@ public:
uno::Any Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
- bool SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck);
+ bool SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck);
void ToSentenceStart();
- const ::svx::SpellPortions GetLastPortions() const { return aLastPortions;}
+ const svx::SpellPortions GetLastPortions() const { return aLastPortions;}
SpellContentPositions GetLastPositions() const {return aLastPositions;}
void ContinueAfterThisSentence() { bMoveToEndOfSentence = true; }
};
@@ -576,7 +576,7 @@ bool SwEditShell::HasLastSentenceGotGrammarChecked() const
bool bTextWasGrammarChecked = false;
if (pSpellIter)
{
- ::svx::SpellPortions aLastPortions( pSpellIter->GetLastPortions() );
+ svx::SpellPortions aLastPortions( pSpellIter->GetLastPortions() );
for (size_t i = 0; i < aLastPortions.size() && !bTextWasGrammarChecked; ++i)
{
// bIsGrammarError is also true if the text was only checked but no
@@ -1052,7 +1052,7 @@ bool SwEditShell::GetGrammarCorrection(
return bRes;
}
-bool SwEditShell::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck)
+bool SwEditShell::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck)
{
OSL_ENSURE( pSpellIter, "SpellIter missing" );
if(!pSpellIter)
@@ -1075,7 +1075,7 @@ void SwEditShell::PutSpellingToSentenceStart()
pSpellIter->ToSentenceStart();
}
-static sal_uInt32 lcl_CountRedlines(const ::svx::SpellPortions& rLastPortions)
+static sal_uInt32 lcl_CountRedlines(const svx::SpellPortions& rLastPortions)
{
sal_uInt32 nRet = 0;
SpellPortions::const_iterator aIter = rLastPortions.begin();
@@ -1098,7 +1098,7 @@ void SwEditShell::MoveContinuationPosToEndOfCheckedSentence()
}
}
-void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bRecheck)
+void SwEditShell::ApplyChangedSentence(const svx::SpellPortions& rNewPortions, bool bRecheck)
{
// Note: rNewPortions.size() == 0 is valid and happens when the whole
// sentence got removed in the dialog
@@ -1328,7 +1328,7 @@ static SpellContentPosition lcl_FindNextDeletedRedline(
return aRet;
}
-bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck)
+bool SwSpellIter::SpellSentence(svx::SpellPortions& rPortions, bool bIsGrammarCheck)
{
bool bRet = false;
aLastPortions.clear();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 6278931cc37c..9ba3d34cb2e9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1188,7 +1188,7 @@ static bool lcl_IsControlGroup( const SdrObject *pObj )
namespace
{
- class MarkableObjectsOnly : public ::svx::ISdrObjectFilter
+ class MarkableObjectsOnly : public svx::ISdrObjectFilter
{
public:
MarkableObjectsOnly( SdrPageView* i_pPV )
@@ -1206,7 +1206,7 @@ namespace
};
}
-const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, bool bFlat, const ::svx::ISdrObjectFilter* pFilter )
+const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, bool bFlat, const svx::ISdrObjectFilter* pFilter )
{
if( !Imp()->HasDrawView() )
return NULL;
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 4e671b3d7560..31d7266b119e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -919,8 +919,8 @@ namespace
{
static void lcl_addShapePropertyEventFactories( SdrObject& _rObj, SwXShape& _rShape )
{
- ::svx::PPropertyValueProvider pProvider( new ::svx::PropertyValueProvider( _rShape, "AnchorType" ) );
- _rObj.getShapePropertyChangeNotifier().registerProvider( ::svx::eTextShapeAnchorType, pProvider );
+ svx::PPropertyValueProvider pProvider( new svx::PropertyValueProvider( _rShape, "AnchorType" ) );
+ _rObj.getShapePropertyChangeNotifier().registerProvider( svx::eTextShapeAnchorType, pProvider );
}
}
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 702b26b156b1..0c5cf3cc19c5 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -135,7 +135,7 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl)
aArgs[6].Name = "Cursor";
aArgs[6].Value <<= rConfigItem.GetResultSet();
- ::svx::ODataAccessDescriptor aDescriptor(aArgs);
+ svx::ODataAccessDescriptor aDescriptor(aArgs);
SwWrtShell& rSh = m_pWizard->GetSwView()->GetWrtShell();
SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor );
rSh.GetDBManager()->MergeNew(aMergeDesc);
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index e6bd8b2e3f1a..b467db4483c1 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -812,7 +812,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
return bNextDoc;
}
-bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellPortions& rPortions)
+bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPortions& rPortions)
{
bool bRet = false;
SdrView* pSdrView = rSh.GetDrawView();
diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
index b2b80c24a821..462bca68d334 100644
--- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
@@ -26,7 +26,7 @@
class SwWrtShell;
struct SpellState;
class SwSpellDialogChildWindow
- : public ::svx::SpellDialogChildWindow
+ : public svx::SpellDialogChildWindow
{
bool m_bIsGrammarCheckingOn;
SpellState* m_pSpellState;
@@ -34,7 +34,7 @@ class SwSpellDialogChildWindow
SwWrtShell* GetWrtShell_Impl();
bool MakeTextSelection_Impl(SwWrtShell& rSh, ShellModes eSelMode);
bool FindNextDrawTextError_Impl(SwWrtShell& rSh);
- bool SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellPortions& rPortions);
+ bool SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPortions& rPortions);
void LockFocusNotification(bool bLock);
protected:
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index d7b857162f2f..0ea4d346762b 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -328,7 +328,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
if ( !pFormShell || !pDrawView || !pWindow )
break;
- std::unique_ptr< ::svx::ISdrObjectFilter > pFilter( FmFormShell::CreateFocusableControlFilter(
+ std::unique_ptr< svx::ISdrObjectFilter > pFilter( FmFormShell::CreateFocusableControlFilter(
*pDrawView, *pWindow ) );
if ( !pFilter.get() )
break;
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 4bec55f89fc3..d73654b7d0fb 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -36,8 +36,8 @@ PageColumnControl::PageColumnControl(
PagePropertyPanel& rPanel,
const sal_uInt16 nColumnType,
const bool bLandscape )
- : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) )
- , mpColumnValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) )
+ : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) )
+ , mpColumnValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) )
, maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_COLUMN_MORE) ) )
, mnColumnType( nColumnType )
, mrPagePropPanel(rPanel)
@@ -84,7 +84,7 @@ void PageColumnControl::dispose()
{
mpColumnValueSet.disposeAndClear();
maMoreButton.disposeAndClear();
- ::svx::sidebar::PopupControl::dispose();
+ svx::sidebar::PopupControl::dispose();
}
IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index a7286d6ef849..955323c10159 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -35,7 +35,7 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
class PageColumnControl
- : public ::svx::sidebar::PopupControl
+ : public svx::sidebar::PopupControl
{
public:
PageColumnControl(
@@ -48,7 +48,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
- VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpColumnValueSet;
+ VclPtr< svx::sidebar::ValueSetWithTextControl> mpColumnValueSet;
VclPtr<PushButton> maMoreButton;
sal_uInt16 mnColumnType;
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index aee46d43e074..66ff08c66ec5 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -48,8 +48,8 @@ PageMarginControl::PageMarginControl(
const bool bLandscape,
const FieldUnit eFUnit,
const SfxMapUnit eUnit )
- : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) )
- , mpMarginValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) )
+ : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) )
+ , mpMarginValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) )
, maCustom(VclPtr<FixedText>::Create(this, SW_RES(FT_CUSTOM)))
, maLeft(VclPtr<FixedText>::Create(this, SW_RES(FT_LEFT)))
, maInner(VclPtr<FixedText>::Create(this, SW_RES(FT_INNER)))
@@ -154,7 +154,7 @@ void PageMarginControl::dispose()
maBottom.disposeAndClear();
maBottomMarginEdit.disposeAndClear();
maWidthHeightField.disposeAndClear();
- ::svx::sidebar::PopupControl::dispose();
+ svx::sidebar::PopupControl::dispose();
}
void PageMarginControl::SetMetricFieldMaxValues(const Size& rPageSize)
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 26d5df3d47d3..12a6754b83aa 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -47,7 +47,7 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
class PageMarginControl
- : public ::svx::sidebar::PopupControl
+ : public svx::sidebar::PopupControl
{
public:
PageMarginControl(
@@ -64,7 +64,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
- VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpMarginValueSet;
+ VclPtr< svx::sidebar::ValueSetWithTextControl> mpMarginValueSet;
VclPtr<FixedText> maCustom;
VclPtr<FixedText> maLeft;
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 9e1b284a7328..8dede92c9980 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -32,8 +32,8 @@ PageOrientationControl::PageOrientationControl(
vcl::Window* pParent,
PagePropertyPanel& rPanel,
const bool bLandscape )
- : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) )
- , mpOrientationValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) )
+ : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) )
+ , mpOrientationValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) )
, mbLandscape( bLandscape )
, mrPagePropPanel(rPanel)
{
@@ -69,7 +69,7 @@ PageOrientationControl::~PageOrientationControl()
void PageOrientationControl::dispose()
{
mpOrientationValueSet.disposeAndClear();
- ::svx::sidebar::PopupControl::dispose();
+ svx::sidebar::PopupControl::dispose();
}
IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl)
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index c08a944b4f07..a2ceecff2a5a 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -30,7 +30,7 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
class PageOrientationControl
- : public ::svx::sidebar::PopupControl
+ : public svx::sidebar::PopupControl
{
public:
PageOrientationControl(
@@ -41,7 +41,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
- VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet;
+ VclPtr< svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet;
bool mbLandscape;
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 045ffe8d3e11..89ac394d3443 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -295,7 +295,7 @@ void PagePropertyPanel::Initialize()
mpBindings->Update( SID_ATTR_PAGE_SIZE );
}
-VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent )
+VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent )
{
return VclPtr<PageOrientationControl>::Create( pParent, *this , mpPageItem->IsLandscape() );
}
@@ -372,7 +372,7 @@ void PagePropertyPanel::ClosePageOrientationPopup()
maOrientationPopup.Hide();
}
-VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent )
+VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( svx::sidebar::PopupContainer* pParent )
{
return VclPtr<PageMarginControl>::Create(
@@ -423,7 +423,7 @@ void PagePropertyPanel::ClosePageMarginPopup()
maMarginPopup.Hide();
}
-VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent )
+VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( svx::sidebar::PopupContainer* pParent )
{
return VclPtr<PageSizeControl>::Create(
@@ -458,7 +458,7 @@ void PagePropertyPanel::ClosePageSizePopup()
maSizePopup.Hide();
}
-VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent )
+VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( svx::sidebar::PopupContainer* pParent )
{
return VclPtr<PageColumnControl>::Create(
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 19d391deaaf6..81721360d0bc 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -72,11 +72,11 @@ namespace sw { namespace sidebar {
return mpBindings;
}
- VclPtr< ::svx::sidebar::PopupControl> CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent );
+ VclPtr< svx::sidebar::PopupControl> CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent );
void ExecuteOrientationChange( const bool bLandscape );
void ClosePageOrientationPopup();
- VclPtr< ::svx::sidebar::PopupControl> CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent );
+ VclPtr< svx::sidebar::PopupControl> CreatePageMarginControl( svx::sidebar::PopupContainer* pParent );
void ExecuteMarginLRChange(
const long nPageLeftMargin,
const long nPageRightMargin );
@@ -86,11 +86,11 @@ namespace sw { namespace sidebar {
void ExecutePageLayoutChange( const bool bMirrored );
void ClosePageMarginPopup();
- VclPtr< ::svx::sidebar::PopupControl> CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent );
+ VclPtr< svx::sidebar::PopupControl> CreatePageSizeControl( svx::sidebar::PopupContainer* pParent );
void ExecuteSizeChange( const Paper ePaper );
void ClosePageSizePopup();
- VclPtr< ::svx::sidebar::PopupControl> CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent );
+ VclPtr< svx::sidebar::PopupControl> CreatePageColumnControl( svx::sidebar::PopupContainer* pParent );
void ExecuteColumnChange( const sal_uInt16 nColumnType );
void ClosePageColumnPopup();
@@ -190,10 +190,10 @@ namespace sw { namespace sidebar {
::sfx2::sidebar::ControllerItem m_aSwPagePgMetricControl;
// popups
- ::svx::sidebar::Popup maOrientationPopup;
- ::svx::sidebar::Popup maMarginPopup;
- ::svx::sidebar::Popup maSizePopup;
- ::svx::sidebar::Popup maColumnPopup;
+ svx::sidebar::Popup maOrientationPopup;
+ svx::sidebar::Popup maMarginPopup;
+ svx::sidebar::Popup maSizePopup;
+ svx::sidebar::Popup maColumnPopup;
const css::uno::Reference< css::document::XUndoManager > mxUndoManager;
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index bc9c0b9be335..5ff924683c21 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -41,8 +41,8 @@ PageSizeControl::PageSizeControl(
const Paper ePaper,
const bool bLandscape,
const FieldUnit eFUnit )
- : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) )
- , mpSizeValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) )
+ : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) )
+ , mpSizeValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) )
, maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_SIZE_MORE) ) )
, maWidthHeightField( VclPtr<MetricField>::Create( this, SW_RES(FLD_WIDTH_HEIGHT) ) )
, mePaper( ePaper )
@@ -151,7 +151,7 @@ void PageSizeControl::dispose()
mpSizeValueSet.disposeAndClear();
maMoreButton.disposeAndClear();
maWidthHeightField.disposeAndClear();
- ::svx::sidebar::PopupControl::dispose();
+ svx::sidebar::PopupControl::dispose();
}
IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index f2875cccc013..ae4756af6604 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -38,7 +38,7 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
class PageSizeControl
- : public ::svx::sidebar::PopupControl
+ : public svx::sidebar::PopupControl
{
public:
PageSizeControl(
@@ -51,7 +51,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
- VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpSizeValueSet;
+ VclPtr< svx::sidebar::ValueSetWithTextControl> mpSizeValueSet;
VclPtr<PushButton> maMoreButton;
// hidden metric field
VclPtr<MetricField> maWidthHeightField;
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 2e845614323e..add57844f094 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -135,7 +135,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
OSL_ENSURE( pDescriptorItem, "SwView::ExecDraw(SID_FM_CREATE_FIELDCONTROL): invalid request args!" );
if( pDescriptorItem )
{
- ::svx::ODataAccessDescriptor aDescriptor( pDescriptorItem->GetValue() );
+ svx::ODataAccessDescriptor aDescriptor( pDescriptorItem->GetValue() );
SdrObject* pObj = pFormView->CreateFieldControl( aDescriptor );
if ( pObj )
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 8ec7d51eea4d..e97edd17881c 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -217,7 +217,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
SwDBManager* pDBManager = rSh.GetDBManager();
if(aURL.Complete.equalsAscii(cURLInsertContent))
{
- ::svx::ODataAccessDescriptor aDescriptor(aArgs);
+ svx::ODataAccessDescriptor aDescriptor(aArgs);
SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor );
pDBManager->MergeNew(aMergeDesc);
}
@@ -245,10 +245,10 @@ void SwXDispatch::dispatch(const util::URL& aURL,
aEvent.Source = *(cppu::OWeakObject*)this;
const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc();
- ::svx::ODataAccessDescriptor aDescriptor;
+ svx::ODataAccessDescriptor aDescriptor;
aDescriptor.setDataSource(rData.sDataSource);
- aDescriptor[::svx::daCommand] <<= rData.sCommand;
- aDescriptor[::svx::daCommandType] <<= rData.nCommandType;
+ aDescriptor[svx::daCommand] <<= rData.sCommand;
+ aDescriptor[svx::daCommandType] <<= rData.nCommandType;
aEvent.State <<= aDescriptor.createPropertyValueSequence();
aEvent.IsEnabled = !rData.sDataSource.isEmpty();
@@ -291,10 +291,10 @@ void SwXDispatch::addStatusListener(
{
const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc();
- ::svx::ODataAccessDescriptor aDescriptor;
+ svx::ODataAccessDescriptor aDescriptor;
aDescriptor.setDataSource(rData.sDataSource);
- aDescriptor[::svx::daCommand] <<= rData.sCommand;
- aDescriptor[::svx::daCommandType] <<= rData.nCommandType;
+ aDescriptor[svx::daCommand] <<= rData.sCommand;
+ aDescriptor[svx::daCommandType] <<= rData.nCommandType;
aEvent.State <<= aDescriptor.createPropertyValueSequence();
aEvent.IsEnabled = !rData.sDataSource.isEmpty();
generated by cgit (git 2.34.1) at 2025-01-22 07:56:18 +0000