cui/source/customize/macropg.cxx | 1 - cui/source/inc/iconcdlg.hxx | 1 - cui/source/options/cuisrchdlg.cxx | 2 -- cui/source/options/fontsubs.cxx | 4 ---- cui/source/options/optdict.cxx | 1 - cui/source/options/optfltr.cxx | 3 --- cui/source/options/optgdlg.cxx | 8 -------- cui/source/options/optgdlg.hxx | 1 - cui/source/options/optinet2.hxx | 13 ------------- cui/source/options/optlingu.cxx | 7 ------- cui/source/options/optmemory.cxx | 2 -- cui/source/options/optmemory.hxx | 1 - cui/source/options/optpath.cxx | 1 - cui/source/tabpages/border.cxx | 2 -- cui/source/tabpages/macroass.cxx | 3 --- cui/source/tabpages/numpages.cxx | 1 - cui/source/tabpages/transfrm.cxx | 3 --- 17 files changed, 54 deletions(-)
New commits: commit 2496eb6fd40ed6d91bdbc4a85e5b30b1afc707d1 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Sun Apr 22 05:08:10 2012 +0900 removed unused static data diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 30f74ec..f850929 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::linguistic2; // static ---------------------------------------------------------------- -static const sal_uInt16 nNameLen = 8; static const short NOACTDICT = -1; static long nStaticTabs[]= diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index ea17472..418455e 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1228,10 +1228,6 @@ static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.ope static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General")); //static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic")); static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); -static const OUString sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N")); -static const OUString sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale")); -static const OUString sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N")); -static const OUString sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index e433c44..198eff8 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -167,8 +167,6 @@ static void lcl_OpenURL( ::rtl::OUString sURL ) } } -static const sal_uInt16 nNameLen = 8; - static sal_uInt16 pRanges[] = { SID_ATTR_SPELL, diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0b4dfa1..a4d3837 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -104,7 +104,6 @@ SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr); static sal_Bool bLastRelative = sal_False; static const sal_Char cNumberingType[] = "NumberingType"; -static const sal_Char cValue[] = "Value"; static const sal_Char cParentNumbering[] = "ParentNumbering"; static const sal_Char cPrefix[] = "Prefix"; static const sal_Char cSuffix[] = "Suffix"; commit 2ce52cbb18e8083dc14c6701a2dab8ca32b81967 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Sun Apr 22 05:07:37 2012 +0900 removed unused defines diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 94719ff..6e5a4ff 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -104,7 +104,6 @@ static long nTabs[] = #define ITMEID_ASSMACRO 2 -#define LB_EVENTS_ITEMPOS 1 #define LB_MACROS_ITEMPOS 2 diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 41bdf61..ed7079d 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -40,7 +40,6 @@ #include <vector> #define CTRLS_OFFSET 3 -#define BUTTON_DISTANCE 8 #define RET_USER 100 #define RET_USER_CANCEL 101 diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 7422230..aba0b5b 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -47,8 +47,6 @@ #include <cuires.hrc> -#define ITEMID_SETITEM 0 - #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> #include <dialmgr.hxx> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 0646287..d59c5ee 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -46,10 +46,6 @@ /* */ /*********************************************************************/ -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 - SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet), diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8a3edd6..27c7347 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -43,9 +43,6 @@ enum MSFltrPg2_CheckBoxEntries { InvalidCBEntry }; -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 - // ----------------------------------------------------------------------- OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index aacdd56..ea17472 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -98,8 +98,6 @@ #include <svtools/apearcfg.hxx> #include <svtools/optionsdrawinglayer.hxx> -#define CONFIG_LANGUAGES "OfficeLanguages" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -111,8 +109,6 @@ using ::rtl::OUString; #define C2U(cChar) OUString::createFromAscii(cChar) -#define MAX_PROGRAM_ENTRIES 3 - // class OfaMiscTabPage -------------------------------------------------- int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 817cf46..e4c6672 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -34,7 +34,6 @@ #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> #include <readonlyimage.hxx> -#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" // predeclarations class CanvasSettings; diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 0555005..ac0d425 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -47,12 +47,6 @@ class HeaderBar; class SfxFilter; -#ifndef SV_NODIALOG -#define PROXY_CONTROLS 23 -#define CACHE_CONTROLS 20 - -#define TYPE_CONTROLS 18 - namespace svx { class SecurityOptionsDialog; } @@ -228,13 +222,6 @@ public: }; -#endif - -#ifdef WNT -#else -#define HELPER_PAGE_COMPLETE -#endif - struct SvxEMailTabPage_Impl; class SvxEMailTabPage : public SfxTabPage { diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7e2cb75..e433c44 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -90,7 +90,6 @@ using namespace ::com::sun::star::beans; namespace css = com::sun::star; #define C2U(cChar) OUString::createFromAscii(cChar) -#define SVX_MAX_USERDICTS 20 #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 #define CBCOL_BOTH 2 @@ -1068,10 +1067,6 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, sal_Bool bEna // class SvxLinguTabPage ------------------------------------------------- -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 - SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ): diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 05b3211..c247c30 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -69,8 +69,6 @@ #include "helpid.hrc" #include <dialmgr.hxx> -#define CONFIG_LANGUAGES "OfficeLanguages" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 65b9a14..60da400 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -34,7 +34,6 @@ #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> -#define FOLDERWEBVIEW_DEFAULTFILE "folder.so" // class OfaMiscTabPage -------------------------------------------------- diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f1f4d86..63593c0 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -81,7 +81,6 @@ using namespace svx; #define POSTFIX_INTERNAL String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_internal" ) ) #define POSTFIX_USER String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_user" ) ) #define POSTFIX_WRITABLE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) ) -#define POSTFIX_READONLY String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_readonly" ) ) #define VAR_ONE String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) ) #define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index f7c69da..67bbeb9 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -38,8 +38,6 @@ #include "border.hrc" #include "helpid.hrc" -#define LINESTYLE_HTML_MAX 5 - #include <svx/xtable.hxx> // XColorList #include <svx/drawitem.hxx> #include <editeng/boxitem.hxx> diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 6edbc68..e61b687 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -117,14 +117,11 @@ static long nTabs[] = 0, 90 }; -#define TAB_WIDTH_MIN 10 - // IDs for items in HeaderBar of EventLB #define ITEMID_EVENT 1 #define ITMEID_ASSMACRO 2 -#define LB_EVENTS_ITEMPOS 1 #define LB_MACROS_ITEMPOS 2 String ConvertToUIName_Impl( SvxMacro *pMacro ) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 46fe07e..9f07125 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -50,9 +50,6 @@ #include <svl/aeitem.hxx> #include <swpossizetabpage.hxx> -// tolerance for WorkingArea -#define DIFF 1000 - // static ---------------------------------------------------------------- static sal_uInt16 pPosSizeRanges[] = _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits