[Libreoffice-commits] core.git: 2 commits - cui/source include/sfx2 include/svx sfx2/source svx/source sw/inc sw/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Sun Aug 18 04:34:36 PDT 2013
cui/source/tabpages/swpossizetabpage.cxx | 3
include/sfx2/sidebar/SidebarPanelBase.hxx | 3
include/sfx2/sidebar/Theme.hxx | 1
include/sfx2/sidebar/Tools.hxx | 2
include/sfx2/tabdlg.hxx | 3
include/svx/nbdtmg.hxx | 1
include/svx/swframeexample.hxx | 1
sfx2/source/dialog/tabdlg.cxx | 25 --
sfx2/source/sidebar/SidebarPanelBase.cxx | 16 -
sfx2/source/sidebar/Theme.cxx | 12 -
sfx2/source/sidebar/Tools.cxx | 12 -
svx/source/dialog/swframeexample.cxx | 17 -
svx/source/sidebar/nbdtmg.cxx | 14 -
sw/inc/dochdl.hrc | 1
sw/inc/globals.hrc | 5
sw/source/ui/app/app.src | 14 -
sw/source/ui/app/error.src | 5
sw/source/ui/dochdl/dochdl.src | 7
sw/source/ui/frmdlg/column.cxx | 18 -
sw/source/ui/frmdlg/frmui.src | 6
sw/source/ui/inc/app.hrc | 6
sw/source/ui/inc/column.hxx | 16 -
sw/source/ui/inc/frmpage.hxx | 4
sw/source/ui/inc/frmui.hrc | 1
sw/source/ui/inc/prcntfld.hxx | 68 -------
sw/source/ui/inc/shells.hrc | 2
sw/source/ui/shells/shells.src | 12 -
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tablepg.hxx | 8
sw/source/ui/uiview/view.hrc | 1
sw/source/ui/uiview/view.src | 10 -
sw/source/ui/utlui/prcntfld.cxx | 285 ------------------------------
unusedcode.easy | 3
vcl/inc/ilstbox.hxx | 1
vcl/source/control/ilstbox.cxx | 10 -
35 files changed, 37 insertions(+), 558 deletions(-)
New commits:
commit c7025e93c42ded24b3eea5722accb767f1c77cad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 18 12:11:04 2013 +0100
remove various unused queryboxs
Change-Id: Ie8ae7c19b957410517c2a1a4f6463825bafd0e09
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index c37def0..01dd46c 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -25,7 +25,6 @@
#define STR_NOGLOS (RC_DOCHDL_BEGIN + 1)
#define MSG_ERR_INSERT_GLOS (RC_DOCHDL_BEGIN + 3)
#define MSG_CLPBRD_FORMAT_ERROR (RC_DOCHDL_BEGIN + 4)
-#define MSG_UPDATE_NEW_GLOS_FMT (RC_DOCHDL_BEGIN + 5)
#define STR_NO_TABLE (RC_DOCHDL_BEGIN + 7)
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 652eeed..967584f 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -84,14 +84,9 @@
#define STR_READONLY_PATH (RC_GLOBALS_BEGIN + 47)
#define IL_SECTION_BITMAPS (RC_GLOBALS_BEGIN + 48)
-// DIALOGS -----------------------------------------------------------
-
-#define DLG_SPECIAL (RC_GLOBALS_BEGIN + 3)
-
// INFOBOX ------------------------------------------------------------
#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
-#define ERR_CLPBRD_WRITE (RC_GLOBALS_BEGIN + 2)
#define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
// ACC ---------------------------------------------------------------
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 0d6cc20..5b4000c 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -267,13 +267,6 @@ String STR_READONLY_PATH
Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?";
};
-InfoBox MSG_ERROR_SEND_MAIL
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Error sending mail." ;
-};
-
InfoBox MSG_ERROR_PASSWD
{
BUTTONS = WB_OK ;
@@ -438,13 +431,6 @@ String STR_EMPTYPAGE
Text [ en-US ] = "blank page" ;
};
-QueryBox MSG_CLPBRD_CLEAR
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- Message [ en-US ] = "You have a large amount of data saved in the clipboard.\nShould the clipboard contents remain available for other applications?" ;
-};
-
String STR_ABSTRACT_TITLE
{
Text [ en-US ] = "Abstract: " ;
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index b2a2433..9cfda24 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -33,11 +33,6 @@ String STR_COMCORE_CANT_SHOW
Text [ en-US ] = "Graphic cannot be displayed." ;
};
-
-InfoBox ERR_CLPBRD_WRITE
-{
- Message [ en-US ] = "Error while copying to the clipboard." ;
-};
InfoBox ERR_CLPBRD_READ
{
Message [ en-US ] = "Error reading from the clipboard." ;
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index f038147..a24976c 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -42,13 +42,6 @@ InfoBox MSG_CLPBRD_FORMAT_ERROR
Message [ en-US ] = "Requested clipboard format is not available." ;
};
-QueryBox MSG_UPDATE_NEW_GLOS_FMT
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "The section format is outdated.\nIt needs to be converted so that changes\ncan be saved.\nShould it be converted now?" ;
-};
-
String STR_PRIVATETEXT
{
Text [ en-US ] = "%PRODUCTNAME Writer" ;
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index f771bb7..939f5af 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -106,11 +106,5 @@ String STR_FRMUI_PATTERN
{
Text [ en-US ] = "Background" ;
};
-InfoBox MSG_COLUMN_ERR_BOUNDWIDTH
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Column spacing exceeds the column width." ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 1023c4e..7752ca0 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -22,15 +22,9 @@
#include "rcid.hrc"
-// Should the clipboard for other applications...
-#define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3)
-
#define STR_CANTCREATE (RC_APP_BEGIN + 4)
#define STR_CANTOPEN (RC_APP_BEGIN + 5)
-// Messages
-#define MSG_ERROR_SEND_MAIL ( RC_APP_BEGIN + 6)
-
// For the interface because the RID_APP_BEGIN is now Desktop.
#define RID_SW_NAME ( RC_APP_BEGIN + 8)
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index c893ac3..d8950bb 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -51,7 +51,6 @@
#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46)
#define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47)
-#define MSG_COLUMN_ERR_BOUNDWIDTH (STR_FRMDLG_BEGIN + 48)
#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49)
#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index f5e6426..4070dd2 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -29,7 +29,6 @@
#define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5)
#define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6)
#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7)
-#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9)
#define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10)
#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11)
#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12)
@@ -70,7 +69,6 @@
#define STR_SWBG_PAGE (RC_SHELLS_BEGIN + 44)
#define STR_SWBG_HEADER (RC_SHELLS_BEGIN + 45)
#define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46)
-#define MSG_NO_RULER (RC_SHELLS_BEGIN + 47)
#define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48)
// FREE
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 51017ec..ddba7bd 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -20,12 +20,6 @@
#include <svx/globlmn.hrc>
#include "toolbox.hrc"
#include "helpid.h"
-InfoBox MSG_NO_RULER
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "There are no bitmaps in the Gallery theme 'Rulers'." ;
-};
String STR_GRFILTER_OPENERROR
{
Text [ en-US ] = "Graphics file cannot be opened" ;
@@ -106,12 +100,6 @@ String STR_REDLINE_EDIT
{
Text [ en-US ] = "Edit Changes";
};
-QueryBox DLG_IMPORT_DBNAME
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- Message [ en-US ] = "Use database name as default database for the document?" ;
-};
String STR_PAGE
{
Text [ en-US ] = "Page " ;
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index a78c35a..439f77d 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -38,7 +38,6 @@
#define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16)
#define MSG_SEARCH_START (RC_VIEW_BEGIN + 17)
#define MSG_SEARCH_END (RC_VIEW_BEGIN + 18)
-#define MSG_INDEX_OVERFLOW (RC_VIEW_BEGIN + 19)
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
#define MSG_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21)
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 471a176..1a08b81 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -41,12 +41,6 @@ ImageButton BTN_PAGEDOWN
SmallStyle = TRUE ;
SYMBOL = IMAGEBUTTON_PAGEDOWN ;
};
-QueryBox DLG_SPECIAL
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- Message [ en-US ] = "Do you want check the special regions?" ;
-};
QueryBox DLG_SPECIAL_FORCED
{
BUTTONS = WB_YES_NO ;
@@ -81,10 +75,6 @@ InfoBox MSG_NOT_FOUND
{
Message [ en-US ] = "Search key not found." ;
};
-InfoBox MSG_INDEX_OVERFLOW
-{
- Message [ en-US ] = "found." ;
-};
InfoBox MSG_SCAN_NOSOURCE
{
Message [ en-US ] = "Source not specified." ;
commit 46906b68c443939beb9b0c44d3bef9c1ce9c39d9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 18 11:56:11 2013 +0100
callcatcher: update unused code
One of the SfxTabDialog ResID ctors is now gone, progress. Equally pleasing is
that the last use of the old PercentField is gone now as well, so that can be
removed and the new PercentFieldWrap can be renamed as PercentField to take its
place
Change-Id: I7a706e98d4dfdc3541da73c3375ee067a799b4bd
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index bbcaf08..c7c1407 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -547,6 +547,9 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInA
get(m_pFollowCB, "followtextflow");
get(m_pExampleWN, "preview");
+ setOptimalFrmWidth();
+ setOptimalRelWidth();
+
FieldUnit eDlgUnit = GetModuleFieldUnit( rInAttrs );
SetFieldUnit( *m_pHoriByMF, eDlgUnit, sal_True );
SetFieldUnit( *m_pVertByMF, eDlgUnit, sal_True );
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 1c5515d..cab01ce 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -114,9 +114,6 @@ protected:
virtual void SAL_CALL disposing (void)
throw (cssu::RuntimeException);
- void SetControl (::Window* pControl);
- ::Window* GetControl (void) const;
-
private:
Window* mpControl;
const ::rtl::OUString msResourceURL;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 36a3431..ae1e6a6 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -149,7 +149,6 @@ public:
static const Wallpaper GetWallpaper (const ThemeItem eItem);
static sal_Int32 GetInteger (const ThemeItem eItem);
static bool GetBoolean (const ThemeItem eItem);
- static Rectangle GetRectangle (const ThemeItem eItem);
static bool IsHighContrastMode (void);
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index e43323b..1515d1b 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -55,8 +55,6 @@ public:
static css::awt::Gradient VclToAwtGradient (const Gradient aGradient);
static Gradient AwtToVclGradient (const css::awt::Gradient aGradient);
- static SvBorder RectangleToSvBorder (const Rectangle aBox);
-
static css::util::URL GetURL (const ::rtl::OUString& rsCommand);
static cssu::Reference<css::frame::XDispatch> GetDispatch (
const cssu::Reference<css::frame::XFrame>& rxFrame,
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 1d4f534..42c62d9 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -139,9 +139,6 @@ public:
SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
- SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
- const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
- const String *pUserButtonText = 0 );
~SfxTabDialog();
sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index c92bb0f..ae3e6c3 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -371,7 +371,6 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
static OutlineTypeMgr* _instance;
public:
OutlineTypeMgr(const NBOType aType);
- OutlineTypeMgr(const NBOType aType,const SfxItemSet* pArg);
OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr);
virtual ~OutlineTypeMgr() {}
virtual void Init();
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 4023ce7..1414673 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -73,7 +73,6 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
- SvxSwFrameExample(Window* pParent, const ResId& rResID);
SvxSwFrameExample(Window* pParent, WinBits nStyle);
~SvxSwFrameExample();
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 2a9c605..f37335df 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -398,31 +398,6 @@ void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
// -----------------------------------------------------------------------
SfxTabDialog::SfxTabDialog
-
-/* [Description]
-
- Constructor
-*/
-
-(
- SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs
- Window* pParent, // Parent Window
- const ResId& rResId, // ResourceId
- const SfxItemSet* pItemSet, // Itemset with the data;
- // can be NULL, when Pages are onDemand
- sal_Bool bEditFmt, // Flag: templates are processed
- // when yes -> additional Button for standard
- const String* pUserButtonText // Text for UserButton;
- // if != 0, the UserButton is created
-)
- : TabDialog(pParent, rResId)
- , pFrame(pViewFrame)
- , INI_LIST(pItemSet)
-{
- Init_Impl( bFmt, pUserButtonText, &rResId );
-}
-
-SfxTabDialog::SfxTabDialog
(
SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs
Window* pParent, // Parent Window
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 4e65471..c1b0e39 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -111,22 +111,6 @@ void SAL_CALL SidebarPanelBase::disposing (void)
-void SidebarPanelBase::SetControl (::Window* pControl)
-{
- mpControl = pControl;
-}
-
-
-
-
-::Window* SidebarPanelBase::GetControl (void) const
-{
- return mpControl;
-}
-
-
-
-
// XContextChangeEventListener
void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
const ui::ContextChangeEventObject& rEvent)
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index abc4315..d6d95d7 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -151,18 +151,6 @@ bool Theme::GetBoolean (const ThemeItem eItem)
-Rectangle Theme::GetRectangle (const ThemeItem eItem)
-{
- const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Rectangle);
- const sal_Int32 nIndex (GetIndex(eItem, eType));
- const Theme& rTheme (GetCurrentTheme());
- return rTheme.maRectangles[nIndex];
-}
-
-
-
-
bool Theme::IsHighContrastMode (void)
{
const Theme& rTheme (GetCurrentTheme());
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 131ef3f..e355649 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -137,18 +137,6 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient aAwtGradient)
-SvBorder Tools::RectangleToSvBorder (const Rectangle aBox)
-{
- return SvBorder(
- aBox.Left(),
- aBox.Top(),
- aBox.Right(),
- aBox.Bottom());
-}
-
-
-
-
util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
{
util::URL aURL;
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index ee6bfdf..a623eff 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -34,23 +34,6 @@ using namespace ::com::sun::star::text;
#define FLYINFLY_BORDER 3
#define DEMOTEXT "Ij"
-SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) :
-
- Window(pParent, rResID),
-
- nHAlign (HoriOrientation::CENTER),
- nHRel (RelOrientation::FRAME),
- nVAlign (VertOrientation::TOP),
- nVRel (RelOrientation::PRINT_AREA),
- nWrap (WrapTextMode_NONE),
- nAnchor (TextContentAnchorType_AT_PAGE),
- bTrans (sal_False),
- aRelPos (Point(0,0))
-{
- InitColors_Impl();
- SetMapMode(MAP_PIXEL);
-}
-
SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) :
Window(pParent, nStyle),
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 288a85a..679aaca 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1654,20 +1654,6 @@ OutlineTypeMgr::OutlineTypeMgr(const NBOType aType):
ImplLoad(OUString("standard.syc"));
}
-OutlineTypeMgr::OutlineTypeMgr(const NBOType aType,const SfxItemSet* pArg):
- NBOTypeMgrBase(aType,pArg)//,
- //pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUSET_COUNT])
-{
- Init();
- for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ )
- {
- pDefaultOutlineSettingsArrs[nItem] = pOutlineSettingsArrs[nItem];
- }
- //Initial the first time to store the default value. Then do it again for customized value
- Init();
- ImplLoad(OUString("standard.syc"));
-}
-
OutlineTypeMgr::OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr):
NBOTypeMgrBase(aTypeMgr)//,
//pNumSettingsArrs( new NumSettingsArr_Impl[DEFAULT_NUM_VALUSET_COUNT])
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index aa75d0b..cae138a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -437,11 +437,11 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
get(m_pPgeExampleWN, "pageexample");
get(m_pFrmExampleWN, "frameexample");
- connectPercentFieldWrapper(aEd1, "width1mf");
- connectPercentFieldWrapper(aEd2, "width2mf");
- connectPercentFieldWrapper(aEd3, "width3mf");
- connectPercentFieldWrapper(aDistEd1, "spacing1mf");
- connectPercentFieldWrapper(aDistEd2, "spacing2mf");
+ connectPercentField(aEd1, "width1mf");
+ connectPercentField(aEd2, "width2mf");
+ connectPercentField(aEd3, "width3mf");
+ connectPercentField(aDistEd1, "spacing1mf");
+ connectPercentField(aDistEd2, "spacing2mf");
SetExchangeSupport();
@@ -556,12 +556,12 @@ void SwColumnPage::SetPageWidth(long nPageWidth)
aEd3.SetMax(nNewMaxWidth, FUNIT_TWIP);
}
-void SwColumnPage::connectPercentFieldWrapper(PercentFieldWrap &rWrap, const OString &rName)
+void SwColumnPage::connectPercentField(PercentField &rWrap, const OString &rName)
{
MetricField *pFld = get<MetricField>(rName);
assert(pFld);
rWrap.set(pFld);
- m_aPercentFieldWrappersMap[pFld] = &rWrap;
+ m_aPercentFieldsMap[pFld] = &rWrap;
}
void SwColumnPage::Reset(const SfxItemSet &rSet)
@@ -989,7 +989,7 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
{
- PercentFieldWrap *pFld = m_aPercentFieldWrappersMap[pMetricFld];
+ PercentField *pFld = m_aPercentFieldsMap[pMetricFld];
assert(pFld);
long nActValue = static_cast< long >(pFld->DenormalizePercent(pFld->GetValue(FUNIT_TWIP)));
if(nCols < 2)
@@ -1062,7 +1062,7 @@ IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricFld )
{
- PercentFieldWrap *pField = m_aPercentFieldWrappersMap[pMetricFld];
+ PercentField *pField = m_aPercentFieldsMap[pMetricFld];
assert(pField);
pModifiedField = pField;
Timeout();
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index bab926b..e50a5d9 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -98,14 +98,14 @@ class SwColumnPage : public SfxTabPage
PushButton* m_pBtnBack;
FixedText* m_pLbl1;
- PercentFieldWrap aEd1;
+ PercentField aEd1;
FixedText* m_pLbl2;
- PercentFieldWrap aEd2;
+ PercentField aEd2;
FixedText* m_pLbl3;
- PercentFieldWrap aEd3;
+ PercentField aEd3;
PushButton* m_pBtnNext;
- PercentFieldWrap aDistEd1;
- PercentFieldWrap aDistEd2;
+ PercentField aDistEd1;
+ PercentField aDistEd2;
CheckBox* m_pAutoWidthBox;
FixedText* m_pLineTypeLbl;
@@ -133,9 +133,9 @@ class SwColumnPage : public SfxTabPage
long nColWidth[nMaxCols];
long nColDist[nMaxCols];
sal_uInt16 nMinWidth;
- PercentFieldWrap* pModifiedField;
+ PercentField* pModifiedField;
- std::map<MetricField*, PercentFieldWrap*> m_aPercentFieldWrappersMap;
+ std::map<MetricField*, PercentField*> m_aPercentFieldsMap;
sal_Bool bFormat;
sal_Bool bFrm;
@@ -169,7 +169,7 @@ class SwColumnPage : public SfxTabPage
SwColumnPage(Window *pParent, const SfxItemSet &rSet);
- void connectPercentFieldWrapper(PercentFieldWrap &rWrap, const OString &rName);
+ void connectPercentField(PercentField &rWrap, const OString &rName);
bool isLineNotNone() const;
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 26de98c..dbcc213 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -46,13 +46,13 @@ class SwFrmPage: public SfxTabPage
// size
FixedText* m_pWidthFT;
FixedText* m_pWidthAutoFT;
- PercentFieldWrap m_aWidthED;
+ PercentField m_aWidthED;
CheckBox* m_pRelWidthCB;
CheckBox* m_pAutoWidthCB;
FixedText* m_pHeightFT;
FixedText* m_pHeightAutoFT;
- PercentFieldWrap m_aHeightED;
+ PercentField m_aHeightED;
CheckBox* m_pRelHeightCB;
CheckBox* m_pAutoHeightCB;
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index f8f45e2..f66ad6e 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -24,7 +24,7 @@
#include "uitool.hxx"
//Wraps a MetricField with extra features, preferred to PercentField
-class SW_DLLPUBLIC PercentFieldWrap
+class SW_DLLPUBLIC PercentField
{
MetricField* m_pField;
@@ -44,7 +44,7 @@ class SW_DLLPUBLIC PercentFieldWrap
public:
- PercentFieldWrap();
+ PercentField();
void set(MetricField *pField);
const MetricField* get() const { return m_pField; }
MetricField* get() { return m_pField; }
@@ -106,70 +106,6 @@ public:
bool IsAutoCalculationLocked() const {return bLockAutoCalculation;}
};
-
-class SW_DLLPUBLIC PercentField : public MetricField
-{
- sal_Int64 nRefValue; // 100% value for conversion (in Twips)
- sal_Int64 nOldMax;
- sal_Int64 nOldMin;
- sal_Int64 nOldSpinSize;
- sal_Int64 nOldBaseValue;
- sal_Int64 nLastPercent;
- sal_Int64 nLastValue;
- sal_uInt16 nOldDigits;
- FieldUnit eOldUnit;
- sal_Bool bLockAutoCalculation; //prevent recalcution of percent values when the
- //reference value is changed
-
- SW_DLLPRIVATE sal_Int64 ImpPower10(sal_uInt16 n);
-
- using MetricField::SetValue;
- using MetricField::GetValue;
- using MetricFormatter::SetUserValue;
- using MetricFormatter::SetBaseValue;
- using MetricFormatter::SetMax;
- using MetricFormatter::SetMin;
- using NumericFormatter::IsValueModified;
-
-public:
-
- virtual void SetValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
-
- PercentField( Window* pWin, const ResId& rResId );
-
- void SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
-
- void SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
-
- void SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
-
- sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE);
-
- sal_Bool IsValueModified();
-
- //using NumericFormatter::SetMax;
- void SetMax(sal_Int64 nNewMax, FieldUnit eInUnit = FUNIT_NONE);
-
- //using NumericFormatter::SetMin;
- void SetMin(sal_Int64 nNewMin, FieldUnit eInUnit = FUNIT_NONE);
-
- sal_Int64 NormalizePercent(sal_Int64 nValue);
- sal_Int64 DenormalizePercent(sal_Int64 nValue);
-
- void SetRefValue(sal_Int64 nValue);
- inline sal_Int64 GetRefValue() const { return nRefValue; }
- sal_Int64 GetRealValue(FieldUnit eOutUnit = FUNIT_NONE);
-
- sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit);
-
- void ShowPercent(sal_Bool bPercent);
-
- sal_uInt16 GetOldDigits() const {return nOldDigits;}
-
- void LockAutoCalculation(sal_Bool bLock) {bLockAutoCalculation = bLock;}
- sal_Bool IsAutoCalculationLocked()const {return bLockAutoCalculation;}
-};
-
#endif // _PRCNTFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e833ba8..bc96b1d 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -945,7 +945,7 @@ sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& )
void SwTableColumnPage::ModifyHdl( MetricField* pField )
{
- PercentFieldWrap *pEdit = NULL;
+ PercentField *pEdit = NULL;
sal_uInt16 nAktPos;
sal_uInt16 i;
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 84703bd..3e48492 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -39,7 +39,7 @@ class SwFormatTablePage : public SfxTabPage
{
TableNameEdit* m_pNameED;
FixedText* m_pWidthFT;
- PercentFieldWrap m_aWidthMF;
+ PercentField m_aWidthMF;
CheckBox* m_pRelWidthCB;
RadioButton* m_pFullBtn;
@@ -50,9 +50,9 @@ class SwFormatTablePage : public SfxTabPage
RadioButton* m_pFreeBtn;
FixedText* m_pLeftFT;
- PercentFieldWrap m_aLeftMF;
+ PercentField m_aLeftMF;
FixedText* m_pRightFT;
- PercentFieldWrap m_aRightMF;
+ PercentField m_aRightMF;
FixedText* m_pTopFT;
MetricField* m_pTopMF;
FixedText* m_pBottomFT;
@@ -103,7 +103,7 @@ class SwTableColumnPage : public SfxTabPage
PushButton* m_pDownBtn;
SwTableRep* pTblData;
- PercentFieldWrap m_aFieldArr[MET_FIELDS];
+ PercentField m_aFieldArr[MET_FIELDS];
FixedText* m_pTextArr[MET_FIELDS];
SwTwips nTableWidth;
SwTwips nMinWidth;
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 4aa8659..e2f217b 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -20,24 +20,7 @@
#include "prcntfld.hxx"
-PercentField::PercentField( Window* pWin, const ResId& rResId ) :
- MetricField ( pWin, rResId ),
-
- nOldMax (0),
- nOldMin (0),
- nLastPercent(-1),
- nLastValue (-1),
- eOldUnit (FUNIT_NONE),
- bLockAutoCalculation(sal_False)
-{
-
- nOldSpinSize = GetSpinSize();
- nRefValue = DenormalizePercent(MetricField::GetMax(FUNIT_TWIP));
- nOldDigits = GetDecimalDigits();
- SetCustomUnitText(OUString('%'));
-}
-
-PercentFieldWrap::PercentFieldWrap()
+PercentField::PercentField()
: nOldMax(0)
, nOldMin(0)
, nLastPercent(-1)
@@ -47,7 +30,7 @@ PercentFieldWrap::PercentFieldWrap()
{
}
-void PercentFieldWrap::set(MetricField *pField)
+void PercentField::set(MetricField *pField)
{
m_pField = pField;
nOldSpinSize = m_pField->GetSpinSize();
@@ -62,87 +45,11 @@ void PercentField::SetRefValue(sal_Int64 nValue)
nRefValue = nValue;
- if (!bLockAutoCalculation && (GetUnit() == FUNIT_CUSTOM))
- SetPrcntValue(nRealValue, eOldUnit);
-}
-
-void PercentFieldWrap::SetRefValue(sal_Int64 nValue)
-{
- sal_Int64 nRealValue = GetRealValue(eOldUnit);
-
- nRefValue = nValue;
-
if (!bLockAutoCalculation && (m_pField->GetUnit() == FUNIT_CUSTOM))
SetPrcntValue(nRealValue, eOldUnit);
}
-void PercentField::ShowPercent(sal_Bool bPercent)
-{
- if ((bPercent && GetUnit() == FUNIT_CUSTOM) ||
- (!bPercent && GetUnit() != FUNIT_CUSTOM))
- return;
-
- sal_Int64 nOldValue;
-
- if (bPercent)
- {
- sal_Int64 nAktWidth, nPercent;
-
- nOldValue = GetValue();
-
- eOldUnit = GetUnit();
- nOldDigits = GetDecimalDigits();
- nOldMin = GetMin();
- nOldMax = GetMax();
- nOldSpinSize = GetSpinSize();
- nOldBaseValue = GetBaseValue();
- SetUnit(FUNIT_CUSTOM);
- SetDecimalDigits( 0 );
-
- nAktWidth = ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
- // round to 0.5 percent
- nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
-
- MetricField::SetMin(std::max(static_cast< sal_Int64 >(1), nPercent));
- MetricField::SetMax(100);
- SetSpinSize(5);
- MetricField::SetBaseValue(0);
- if (nOldValue != nLastValue)
- {
- nAktWidth = ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
- nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
- MetricFormatter::SetValue(nPercent);
- nLastPercent = nPercent;
- nLastValue = nOldValue;
- }
- else
- MetricFormatter::SetValue(nLastPercent);
- }
- else
- {
- sal_Int64 nOldPercent = GetValue(FUNIT_CUSTOM);
-
- nOldValue = Convert(GetValue(), GetUnit(), eOldUnit);
-
- SetUnit(eOldUnit);
- SetDecimalDigits(nOldDigits);
- MetricField::SetMin(nOldMin);
- MetricField::SetMax(nOldMax);
- SetSpinSize(nOldSpinSize);
- MetricField::SetBaseValue(nOldBaseValue);
-
- if (nOldPercent != nLastPercent)
- {
- SetPrcntValue(nOldValue, eOldUnit);
- nLastPercent = nOldPercent;
- nLastValue = nOldValue;
- }
- else
- SetPrcntValue(nLastValue, eOldUnit);
- }
-}
-
-void PercentFieldWrap::ShowPercent(bool bPercent)
+void PercentField::ShowPercent(bool bPercent)
{
if ((bPercent && m_pField->GetUnit() == FUNIT_CUSTOM) ||
(!bPercent && m_pField->GetUnit() != FUNIT_CUSTOM))
@@ -208,36 +115,8 @@ void PercentFieldWrap::ShowPercent(bool bPercent)
}
}
-void PercentField::SetValue(sal_Int64 nNewValue, FieldUnit eInUnit)
-{
- MetricFormatter::SetValue(nNewValue, eInUnit);
-}
-
void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit)
{
- if (GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM)
- MetricFormatter::SetValue(Convert(nNewValue, eInUnit, GetUnit()));
-
- else
- {
- // Overwrite output value, do not restore later
- sal_Int64 nPercent, nAktWidth;
- if(eInUnit == FUNIT_TWIP)
- {
- nAktWidth = ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP);
- }
- else
- {
- sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit);
- nAktWidth = ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
- }
- nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
- MetricFormatter::SetValue(nPercent);
- }
-}
-
-void PercentFieldWrap::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM)
m_pField->SetValue(Convert(nNewValue, eInUnit, m_pField->GetUnit()));
else
@@ -258,7 +137,7 @@ void PercentFieldWrap::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit)
}
}
-void PercentFieldWrap::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit)
+void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit)
{
if (m_pField->GetUnit() == FUNIT_CUSTOM)
nOldBaseValue = m_pField->ConvertValue(nNewValue, 0, nOldDigits, eInUnit, eOldUnit);
@@ -266,65 +145,13 @@ void PercentFieldWrap::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit)
m_pField->SetBaseValue(nNewValue, eInUnit);
}
-void PercentField::SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit )
-{
- if (GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM)
- MetricField::SetUserValue(Convert(nNewValue, eInUnit, GetUnit()),FUNIT_NONE);
-
- else
- {
- // Overwrite output value, do not restore later
- sal_Int64 nPercent, nAktWidth;
- if(eInUnit == FUNIT_TWIP)
- {
- nAktWidth = ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP);
- }
- else
- {
- sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit);
- nAktWidth = ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
- }
- nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
- MetricField::SetUserValue(nPercent,FUNIT_NONE);
- }
-
-}
-
-void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit)
-{
- if (GetUnit() == FUNIT_CUSTOM)
- nOldBaseValue = ConvertValue(nNewValue, 0, nOldDigits, eInUnit, eOldUnit);
- else
- MetricField::SetBaseValue(nNewValue, eInUnit);
-}
-
-sal_Int64 PercentField::GetValue( FieldUnit eOutUnit )
-{
- return Convert(MetricField::GetValue(), GetUnit(), eOutUnit);
-}
-
-sal_Int64 PercentFieldWrap::GetValue(FieldUnit eOutUnit)
+sal_Int64 PercentField::GetValue(FieldUnit eOutUnit)
{
return Convert(m_pField->GetValue(), m_pField->GetUnit(), eOutUnit);
}
void PercentField::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit)
{
- if (GetUnit() != FUNIT_CUSTOM)
- MetricField::SetMin(nNewMin, eInUnit);
- else
- {
- if (eInUnit == FUNIT_NONE)
- eInUnit = eOldUnit;
- nOldMin = Convert(nNewMin, eInUnit, eOldUnit);
-
- sal_Int64 nPercent = Convert(nNewMin, eInUnit, FUNIT_CUSTOM);
- MetricField::SetMin(std::max( static_cast< sal_Int64 >(1), nPercent));
- }
-}
-
-void PercentFieldWrap::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM)
m_pField->SetMin(nNewMin, eInUnit);
else
@@ -340,17 +167,6 @@ void PercentFieldWrap::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit)
void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
{
- if (GetUnit() != FUNIT_CUSTOM)
- MetricField::SetMax(nNewMax, eInUnit);
- else
- {
- if (eInUnit == FUNIT_NONE)
- eInUnit = eOldUnit;
- }
-}
-
-void PercentFieldWrap::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM)
m_pField->SetMax(nNewMax, eInUnit);
else
@@ -362,16 +178,6 @@ void PercentFieldWrap::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue)
{
- if (GetUnit() != FUNIT_CUSTOM)
- nValue = MetricField::Normalize(nValue);
- else
- nValue = nValue * ImpPower10(nOldDigits);
-
- return nValue;
-}
-
-sal_Int64 PercentFieldWrap::NormalizePercent(sal_Int64 nValue)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM)
nValue = m_pField->Normalize(nValue);
else
@@ -381,19 +187,6 @@ sal_Int64 PercentFieldWrap::NormalizePercent(sal_Int64 nValue)
sal_Int64 PercentField::DenormalizePercent(sal_Int64 nValue)
{
- if (GetUnit() != FUNIT_CUSTOM)
- nValue = MetricField::Denormalize(nValue);
- else
- {
- sal_Int64 nFactor = ImpPower10(nOldDigits);
- nValue = ((nValue+(nFactor/2)) / nFactor);
- }
-
- return nValue;
-}
-
-sal_Int64 PercentFieldWrap::DenormalizePercent(sal_Int64 nValue)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM)
nValue = m_pField->Denormalize(nValue);
else
@@ -404,7 +197,7 @@ sal_Int64 PercentFieldWrap::DenormalizePercent(sal_Int64 nValue)
return nValue;
}
-bool PercentFieldWrap::IsValueModified()
+bool PercentField::IsValueModified()
{
if (m_pField->GetUnit() == FUNIT_CUSTOM)
return true;
@@ -412,7 +205,7 @@ bool PercentFieldWrap::IsValueModified()
return m_pField->IsValueModified();
}
-void PercentFieldWrap::SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit)
+void PercentField::SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit)
{
if (m_pField->GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM)
m_pField->SetUserValue(Convert(nNewValue, eInUnit, m_pField->GetUnit()),FUNIT_NONE);
@@ -434,26 +227,7 @@ void PercentFieldWrap::SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit)
}
}
-sal_Bool PercentField::IsValueModified()
-{
- if (GetUnit() == FUNIT_CUSTOM)
- return sal_True;
- else
- return MetricField::IsValueModified();
-}
-
-sal_Int64 PercentField::ImpPower10( sal_uInt16 n )
-{
- sal_uInt16 i;
- sal_Int64 nValue = 1;
-
- for ( i=0; i < n; i++ )
- nValue *= 10;
-
- return nValue;
-}
-
-sal_Int64 PercentFieldWrap::ImpPower10(sal_uInt16 n)
+sal_Int64 PercentField::ImpPower10(sal_uInt16 n)
{
sal_Int64 nValue = 1;
@@ -465,14 +239,6 @@ sal_Int64 PercentFieldWrap::ImpPower10(sal_uInt16 n)
sal_Int64 PercentField::GetRealValue(FieldUnit eOutUnit)
{
- if (GetUnit() != FUNIT_CUSTOM)
- return GetValue(eOutUnit);
- else
- return Convert(GetValue(), GetUnit(), eOutUnit);
-}
-
-sal_Int64 PercentFieldWrap::GetRealValue(FieldUnit eOutUnit)
-{
if (m_pField->GetUnit() != FUNIT_CUSTOM)
return GetValue(eOutUnit);
else
@@ -482,41 +248,6 @@ sal_Int64 PercentFieldWrap::GetRealValue(FieldUnit eOutUnit)
sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit)
{
if (eInUnit == eOutUnit ||
- (eInUnit == FUNIT_NONE && eOutUnit == GetUnit()) ||
- (eOutUnit == FUNIT_NONE && eInUnit == GetUnit()))
- return nValue;
-
- if (eInUnit == FUNIT_CUSTOM)
- {
- // Convert to metric
- sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100;
-
- if (eOutUnit == FUNIT_TWIP) // Only convert if necessary
- return NormalizePercent(nTwipValue);
- else
- return ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit);
- }
-
- if (eOutUnit == FUNIT_CUSTOM)
- {
- // Convert to percent
- sal_Int64 nAktWidth;
- nValue = DenormalizePercent(nValue);
-
- if (eInUnit == FUNIT_TWIP) // Only convert if necessary
- nAktWidth = nValue;
- else
- nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
- // Round to 0.5 percent
- return ((nAktWidth * 1000) / nRefValue + 5) / 10;
- }
-
- return ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit);
-}
-
-sal_Int64 PercentFieldWrap::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit)
-{
- if (eInUnit == eOutUnit ||
(eInUnit == FUNIT_NONE && eOutUnit == m_pField->GetUnit()) ||
(eOutUnit == FUNIT_NONE && eInUnit == m_pField->GetUnit()))
return nValue;
diff --git a/unusedcode.easy b/unusedcode.easy
index d438213..2eebe0a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -200,8 +200,6 @@ sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
sfx2::sidebar::SidebarController::ShowDetailMenu(rtl::OUString const&) const
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
-sfx2::sidebar::SidebarPanelBase::GetControl() const
-sfx2::sidebar::SidebarPanelBase::SetControl(Window*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
@@ -217,7 +215,6 @@ svx::sidebar::NBOutlineTypeMgrFact::NBOutlineTypeMgrFact()
svx::sidebar::NumberingTypeMgr::GetNumCount() const
svx::sidebar::NumberingTypeMgr::GetNumSettingByIndex(unsigned short) const
svx::sidebar::NumberingTypeMgr::NumberingTypeMgr(unsigned short, SfxItemSet const*)
-svx::sidebar::OutlineTypeMgr::OutlineTypeMgr(unsigned short, SfxItemSet const*)
svx::sidebar::ParaPropertyPanel::InitImageList(boost::scoped_ptr<ToolBox>&, ImageList&, ImageList&)
svx::sidebar::ParaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
unoidl::UnoidlProvider::getConstant(unsigned int) const
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 3cf1c23..cc42ccf 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -438,7 +438,6 @@ public:
virtual Window* GetPreferredKeyInputWindow();
sal_uInt16 InsertEntry( sal_uInt16 nPos, const OUString& rStr );
- sal_uInt16 InsertEntry( sal_uInt16 nPos, const Image& rImage );
sal_uInt16 InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage );
void RemoveEntry( sal_uInt16 nPos );
void SetEntryData( sal_uInt16 nPos, void* pNewData ) { maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); }
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 68c01ea..03da1f7 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2299,16 +2299,6 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr )
// -----------------------------------------------------------------------
-sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const Image& rImage )
-{
- ImplEntryType* pNewEntry = new ImplEntryType( rImage );
- sal_uInt16 nNewPos = maLBWindow.InsertEntry( nPos, pNewEntry );
- StateChanged( STATE_CHANGE_DATA );
- return nNewPos;
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage )
{
ImplEntryType* pNewEntry = new ImplEntryType( rStr, rImage );
More information about the Libreoffice-commits
mailing list