[Libreoffice-commits] core.git: connectivity/inc dtrans/test include/ucbhelper sc/inc scp2/inc sc/source soltools/mkdepend
Noel Grandin
noel.grandin at collabora.co.uk
Tue Aug 29 13:24:08 UTC 2017
connectivity/inc/strings.hrc | 2 --
dtrans/test/win32/dnd/dndTest.cxx | 2 --
include/ucbhelper/macros.hxx | 12 ------------
sc/inc/globstr.hrc | 1 -
sc/source/ui/attrdlg/scdlgfact.hxx | 23 -----------------------
scp2/inc/macros.inc | 8 --------
soltools/mkdepend/imakemdep.h | 5 -----
7 files changed, 53 deletions(-)
New commits:
commit 45acf26775ac7e91ceb88d8941cee25c2cd65873
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Aug 29 09:50:14 2017 +0200
remove some unused macro definitions
Change-Id: I253e5108161b932e3dc588b656e550bb9dc022b0
Reviewed-on: https://gerrit.libreoffice.org/41672
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
index dc769e1e3ee9..d1062d766817 100644
--- a/connectivity/inc/strings.hrc
+++ b/connectivity/inc/strings.hrc
@@ -119,8 +119,6 @@
// KAB
#define STR_NO_KDE_INST NC_("STR_NO_KDE_INST", "No suitable KDE installation was found.")
#define STR_KDE_VERSION_TOO_OLD NC_("STR_KDE_VERSION_TOO_OLD", "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.")
-#define STR_KDE_VERSION_TOO_NEW NC_("STR_KDE_VERSION_TOO_NEW", "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n")
-#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND NC_("STR_KDE_VERSION_TOO_NEW_WORK_AROUND", "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n")
#define STR_PARA_ONLY_PREPARED NC_("STR_PARA_ONLY_PREPARED", "Parameters can appear only in prepared statements.")
// MACAB
#define STR_NO_TABLE NC_("STR_NO_TABLE", "No such table!")
diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index aae5851c1cab..16d16f74f891 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -49,8 +49,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
-#define WM_CREATE_MTA_WND
-
HRESULT doTest();
DWORD WINAPI MTAFunc( void* threadData);
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index b218f94269b8..da0b2dea8feb 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -188,18 +188,6 @@ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiService
Class::getSupportedServiceNames_Static() ) ); \
}
-// Service without service factory.
-
-// 1 service name
-#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
- \
-css::uno::Sequence< OUString > \
-Class::getSupportedServiceNames_Static() \
-{ \
- return { Service1 }; \
-}
-
#endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 979a0824171c..21eb86eb9cc3 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -197,7 +197,6 @@
#define STR_HEADER NC_("STR_HEADER", "Header")
#define STR_FOOTER NC_("STR_FOOTER", "Footer")
#define STR_TEXTATTRS NC_("STR_TEXTATTRS", "Text Attributes")
-#define STR_HFCMD_DELIMITER NC_("STR_HFCMD_DELIMITER", "\\")
#define STR_HFCMD_PAGE NC_("STR_HFCMD_PAGE", "PAGE")
#define STR_HFCMD_PAGES NC_("STR_HFCMD_PAGES", "PAGES")
#define STR_HFCMD_DATE NC_("STR_HFCMD_DATE", "DATE")
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index d5f8e683f3ba..b22b68b2cd57 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -70,16 +70,6 @@ public: \
virtual Bitmap createScreenshot() const override; \
virtual OString GetScreenshotId() const override; \
-#define DECL_ABSTDLG2_BASE(Class,DialogClass) \
- ScopedVclPtr<DialogClass> pDlg; \
-public: \
- explicit Class( DialogClass* p) \
- : pDlg(p) \
- {} \
- virtual ~Class() override; \
- virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; \
- long GetResult() override;
-
#define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \
{ \
@@ -105,19 +95,6 @@ OString Class::GetScreenshotId() const \
return pDlg->GetScreenshotId(); \
}
-#define IMPL_ABSTDLG2_BASE(Class) \
-Class::~Class() \
-{ \
-} \
-void Class::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) \
-{ \
- pDlg->StartExecuteModal( rEndDialogHdl ) ; \
-} \
-long Class::GetResult() \
-{ \
- return pDlg->GetResult(); \
-}
-
class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg
{
DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4f03fbe58d8e..4e113f90a7f0 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -210,14 +210,6 @@ End
End
#endif
-#define STD_RES_FILE(id,name) \
- File id \
- TXT_FILE_BODY; \
- RESFILE_ALL_LANG(name); \
- Dir = gid_Dir_Resource; \
- Styles = (PACKED); \
- End
-
#define LIBO_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
index 36fd5b8666e4..4a947ee44804 100644
--- a/soltools/mkdepend/imakemdep.h
+++ b/soltools/mkdepend/imakemdep.h
@@ -177,11 +177,6 @@ in this Software without prior written authorization from the X Consortium.
#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(_WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE))
#define FIXUP_CPP_WHITESPACE
#endif
-#ifdef _WIN32
-#define REMOVE_CPP_LEADSPACE
-#define INLINE_SYNTAX
-#define MAGIC_MAKE_VARS
-#endif
#ifdef __minix_vmd
#define FIXUP_CPP_WHITESPACE
#endif
More information about the Libreoffice-commits
mailing list