summaryrefslogtreecommitdiff
path: root/sw/source/ui/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/sidebar')
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.cxx3
-rw-r--r--sw/source/ui/sidebar/PageColumnControl.hxx1
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.cxx9
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.hxx2
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.cxx3
-rw-r--r--sw/source/ui/sidebar/PageOrientationControl.hxx1
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.cxx35
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hrc2
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.hxx1
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.cxx3
-rw-r--r--sw/source/ui/sidebar/PageSizeControl.hxx1
-rw-r--r--sw/source/ui/sidebar/SwPanelFactory.cxx2
-rw-r--r--sw/source/ui/sidebar/WrapPropertyPanel.cxx5
13 files changed, 1 insertions, 67 deletions
diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/ui/sidebar/PageColumnControl.cxx
index 3c148c0b87ec..f2a5f3857bee 100644
--- a/sw/source/ui/sidebar/PageColumnControl.cxx
+++ b/sw/source/ui/sidebar/PageColumnControl.cxx
@@ -75,13 +75,11 @@ PageColumnControl::PageColumnControl(
FreeResource();
}
-
PageColumnControl::~PageColumnControl(void)
{
delete mpColumnValueSet;
}
-
IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
{
mpColumnValueSet->SetNoSelection();
@@ -107,7 +105,6 @@ IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
return 0;
}
-
} } // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PageColumnControl.hxx b/sw/source/ui/sidebar/PageColumnControl.hxx
index caa3836419c2..875bea370fd7 100644
--- a/sw/source/ui/sidebar/PageColumnControl.hxx
+++ b/sw/source/ui/sidebar/PageColumnControl.hxx
@@ -34,7 +34,6 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
-
class PageColumnControl
: public ::svx::sidebar::PopupControl
{
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 2d33467de0d8..717a18554f9c 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -32,7 +32,6 @@
#define SWPAGE_DOWN_GVALUE "Sw_Page_Down"
#define SWPAGE_MIRROR_GVALUE "Sw_Page_Mirrored"
-
namespace sw { namespace sidebar {
PageMarginControl::PageMarginControl(
@@ -128,7 +127,6 @@ PageMarginControl::PageMarginControl(
FreeResource();
}
-
PageMarginControl::~PageMarginControl(void)
{
delete mpMarginValueSet;
@@ -136,7 +134,6 @@ PageMarginControl::~PageMarginControl(void)
StoreUserCustomValues();
}
-
void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize )
{
const long nML = maLeftMarginEdit.Denormalize( maLeftMarginEdit.GetValue(FUNIT_TWIP) );
@@ -164,7 +161,6 @@ void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize )
maBottomMarginEdit.SetMax(maTopMarginEdit.Normalize(nMax), FUNIT_TWIP);
}
-
void PageMarginControl::FillValueSet(
const bool bLandscape,
const bool bUserCustomValuesAvailable )
@@ -259,7 +255,6 @@ void PageMarginControl::FillValueSet(
SW_RESSTR(STR_LCVALUE), &aHelpText );
}
-
void PageMarginControl::SelectValueSetItem()
{
const long cTolerance = 5;
@@ -305,7 +300,6 @@ void PageMarginControl::SelectValueSetItem()
mpMarginValueSet->StartSelection();
};
-
IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
{
if ( pControl == mpMarginValueSet )
@@ -385,7 +379,6 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
return 0;
}
-
IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, EMPTYARG )
{
mpMarginValueSet->SetNoSelection();
@@ -414,7 +407,6 @@ IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, EMPTYARG )
return 0;
}
-
bool PageMarginControl::GetUserCustomValues()
{
bool bUserCustomValuesAvailable = false;
@@ -517,7 +509,6 @@ void PageMarginControl::StoreUserCustomValues()
aWinOpt5.SetUserData( aSeq );
}
-
} } // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PageMarginControl.hxx b/sw/source/ui/sidebar/PageMarginControl.hxx
index 60d5666b7177..f32e8846329c 100644
--- a/sw/source/ui/sidebar/PageMarginControl.hxx
+++ b/sw/source/ui/sidebar/PageMarginControl.hxx
@@ -36,7 +36,6 @@
#define SWPAGE_WIDE_VALUE2 2880
#define SWPAGE_WIDE_VALUE3 1800
-
namespace svx { namespace sidebar {
class ValueSetWithTextControl;
} }
@@ -47,7 +46,6 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
-
class PageMarginControl
: public ::svx::sidebar::PopupControl
{
diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/ui/sidebar/PageOrientationControl.cxx
index 27eb8a9be3af..2dbf8bf8762a 100644
--- a/sw/source/ui/sidebar/PageOrientationControl.cxx
+++ b/sw/source/ui/sidebar/PageOrientationControl.cxx
@@ -61,13 +61,11 @@ PageOrientationControl::PageOrientationControl(
FreeResource();
}
-
PageOrientationControl::~PageOrientationControl(void)
{
delete mpOrientationValueSet;
}
-
IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl)
{
mpOrientationValueSet->SetNoSelection();
@@ -87,7 +85,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl)
return 0;
}
-
} } // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PageOrientationControl.hxx b/sw/source/ui/sidebar/PageOrientationControl.hxx
index a9a9b5e6b883..a4cfe4249376 100644
--- a/sw/source/ui/sidebar/PageOrientationControl.hxx
+++ b/sw/source/ui/sidebar/PageOrientationControl.hxx
@@ -29,7 +29,6 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
-
class PageOrientationControl
: public ::svx::sidebar::PopupControl
{
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/ui/sidebar/PagePropertyPanel.cxx
index 23d5a95066fc..156a1cb03429 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/ui/sidebar/PagePropertyPanel.cxx
@@ -77,7 +77,6 @@ namespace {
}
}
-
namespace sw { namespace sidebar {
PagePropertyPanel* PagePropertyPanel::Create (
@@ -263,13 +262,11 @@ void PagePropertyPanel::Initialize()
mpBindings->Update( SID_ATTR_PAGE_SIZE );
}
-
::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent )
{
return new PageOrientationControl( pParent, *this , mpPageItem->IsLandscape() );
}
-
IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox )
{
maOrientationPopup.Show( *pToolBox );
@@ -277,7 +274,6 @@ IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox )
return 0L;
}
-
void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape )
{
StartUndo();
@@ -336,15 +332,11 @@ void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape )
EndUndo();
}
-
void PagePropertyPanel::ClosePageOrientationPopup()
{
maOrientationPopup.Hide();
}
-
-
-
::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent )
{
return new PageMarginControl(
@@ -359,7 +351,6 @@ void PagePropertyPanel::ClosePageOrientationPopup()
meUnit );
}
-
void PagePropertyPanel::ExecuteMarginLRChange(
const long nPageLeftMargin,
const long nPageRightMargin )
@@ -378,14 +369,12 @@ void PagePropertyPanel::ExecuteMarginULChange(
GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SFX_CALLMODE_RECORD, mpPageULMarginItem.get(), 0L );
}
-
void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored )
{
mpPageItem->SetPageUsage( bMirrored ? SVX_PAGE_MIRROR : SVX_PAGE_ALL );
GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SFX_CALLMODE_RECORD, mpPageItem.get(), 0L );
}
-
IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox )
{
maMarginPopup.Show( *pToolBox );
@@ -393,15 +382,11 @@ IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox )
return 0L;
}
-
void PagePropertyPanel::ClosePageMarginPopup()
{
maMarginPopup.Hide();
}
-
-
-
::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent )
{
return new PageSizeControl(
@@ -412,7 +397,6 @@ void PagePropertyPanel::ClosePageMarginPopup()
meFUnit );
}
-
void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper )
{
Size aPageSize = SvxPaperInfo::GetPaperSize( ePaper, (MapUnit)(meUnit) );
@@ -425,7 +409,6 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper )
mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), 0L );
}
-
IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox )
{
maSizePopup.Show( *pToolBox );
@@ -433,15 +416,11 @@ IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox )
return 0L;
}
-
void PagePropertyPanel::ClosePageSizePopup()
{
maSizePopup.Hide();
}
-
-
-
::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent )
{
return new PageColumnControl(
@@ -451,14 +430,12 @@ void PagePropertyPanel::ClosePageSizePopup()
mpPageItem->IsLandscape() );
}
-
void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType )
{
mpPageColumnTypeItem->SetValue( nColumnType );
mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SFX_CALLMODE_RECORD, mpPageColumnTypeItem.get(), 0L );
}
-
IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox )
{
maColumnPopup.Show( *pToolBox );
@@ -466,15 +443,11 @@ IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox )
return 0L;
}
-
void PagePropertyPanel::ClosePageColumnPopup()
{
maColumnPopup.Hide();
}
-
-
-
void PagePropertyPanel::NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
@@ -551,7 +524,6 @@ void PagePropertyPanel::NotifyItemUpdate(
}
}
-
void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState )
{
meFUnit = FUNIT_NONE;
@@ -582,9 +554,6 @@ void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pSt
}
}
-
-
-
void PagePropertyPanel::ChangeMarginImage()
{
if ( mpPageLRMarginItem.get() == 0 ||
@@ -629,7 +598,6 @@ void PagePropertyPanel::ChangeMarginImage()
mpToolBoxMargin->SetItemImage( nIdMargin, mpPageItem->IsLandscape() ? mImgMarginCustom_L : mImgMarginCustom );
}
-
void PagePropertyPanel::ChangeSizeImage()
{
if ( mpPageSizeItem.get() == 0 ||
@@ -693,7 +661,6 @@ void PagePropertyPanel::ChangeSizeImage()
}
}
-
void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType )
{
if ( mpPageItem.get() == 0 )
@@ -750,7 +717,6 @@ void PagePropertyPanel::ChangeColumnImage( const sal_uInt16 nColumnType )
}
}
-
void PagePropertyPanel::StartUndo()
{
if ( mxUndoManager.is() )
@@ -759,7 +725,6 @@ void PagePropertyPanel::StartUndo()
}
}
-
void PagePropertyPanel::EndUndo()
{
if ( mxUndoManager.is() )
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hrc b/sw/source/ui/sidebar/PagePropertyPanel.hrc
index f7bc210275ad..0f827f0d84fe 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.hrc
+++ b/sw/source/ui/sidebar/PagePropertyPanel.hrc
@@ -130,7 +130,7 @@
#define FLD_BOTTOM_MARGIN 116
#define IMG_CUSTOM_DIS 121
-//
+
#define STR_MARGIN_TOOLTIP_LEFT 122
#define STR_MARGIN_TOOLTIP_RIGHT 123
#define STR_MARGIN_TOOLTIP_INNER 124
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hxx b/sw/source/ui/sidebar/PagePropertyPanel.hxx
index b457a438c5e5..d7b6e57153e0 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/ui/sidebar/PagePropertyPanel.hxx
@@ -73,7 +73,6 @@ namespace sw { namespace sidebar {
return mpBindings;
}
-
::svx::sidebar::PopupControl* CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent );
void ExecuteOrientationChange( const sal_Bool bLandscape );
void ClosePageOrientationPopup();
diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx
index 4a21d344dd09..038e033235f2 100644
--- a/sw/source/ui/sidebar/PageSizeControl.cxx
+++ b/sw/source/ui/sidebar/PageSizeControl.cxx
@@ -141,13 +141,11 @@ PageSizeControl::PageSizeControl(
FreeResource();
}
-
PageSizeControl::~PageSizeControl(void)
{
delete mpSizeValueSet;
}
-
IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
{
mpSizeValueSet->SetNoSelection();
@@ -174,7 +172,6 @@ IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
return 0;
}
-
} } // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PageSizeControl.hxx b/sw/source/ui/sidebar/PageSizeControl.hxx
index 09cc12166a61..e1f0313a3649 100644
--- a/sw/source/ui/sidebar/PageSizeControl.hxx
+++ b/sw/source/ui/sidebar/PageSizeControl.hxx
@@ -37,7 +37,6 @@ namespace sw { namespace sidebar {
class PagePropertyPanel;
-
class PageSizeControl
: public ::svx::sidebar::PopupControl
{
diff --git a/sw/source/ui/sidebar/SwPanelFactory.cxx b/sw/source/ui/sidebar/SwPanelFactory.cxx
index 258ea5d7f7e1..18220cdbdf80 100644
--- a/sw/source/ui/sidebar/SwPanelFactory.cxx
+++ b/sw/source/ui/sidebar/SwPanelFactory.cxx
@@ -68,12 +68,10 @@ SwPanelFactory::SwPanelFactory (void)
{
}
-
SwPanelFactory::~SwPanelFactory (void)
{
}
-
Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
const ::rtl::OUString& rsResourceURL,
const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx
index 490a748300ee..6d4e8526f6fc 100644
--- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx
@@ -60,7 +60,6 @@ WrapPropertyPanel* WrapPropertyPanel::Create (
pBindings);
}
-
WrapPropertyPanel::WrapPropertyPanel(
Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
@@ -88,12 +87,10 @@ WrapPropertyPanel::WrapPropertyPanel(
Initialize();
}
-
WrapPropertyPanel::~WrapPropertyPanel()
{
}
-
void WrapPropertyPanel::Initialize()
{
Link aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl);
@@ -147,7 +144,6 @@ void WrapPropertyPanel::Initialize()
mpBindings->Update( FN_FRAME_WRAP_IDEAL );
}
-
IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG)
{
sal_uInt16 nSlot = 0;
@@ -181,7 +177,6 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG)
return 0;
}
-
void WrapPropertyPanel::NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
generated by cgit (git 2.34.1) at 2024-07-28 03:03:51 +0000