Kaydet (Commit) 45acf267 authored tarafından Noel Grandin's avatar Noel Grandin

remove some unused macro definitions

Change-Id: I253e5108161b932e3dc588b656e550bb9dc022b0
Reviewed-on: https://gerrit.libreoffice.org/41672Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 57d3e8b3
...@@ -119,8 +119,6 @@ ...@@ -119,8 +119,6 @@
// KAB // KAB
#define STR_NO_KDE_INST NC_("STR_NO_KDE_INST", "No suitable KDE installation was found.") #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_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.") #define STR_PARA_ONLY_PREPARED NC_("STR_PARA_ONLY_PREPARED", "Parameters can appear only in prepared statements.")
// MACAB // MACAB
#define STR_NO_TABLE NC_("STR_NO_TABLE", "No such table!") #define STR_NO_TABLE NC_("STR_NO_TABLE", "No such table!")
......
...@@ -49,8 +49,6 @@ using namespace com::sun::star::uno; ...@@ -49,8 +49,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::datatransfer::dnd::DNDConstants;
#define WM_CREATE_MTA_WND
HRESULT doTest(); HRESULT doTest();
DWORD WINAPI MTAFunc( void* threadData); DWORD WINAPI MTAFunc( void* threadData);
......
...@@ -188,18 +188,6 @@ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiService ...@@ -188,18 +188,6 @@ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiService
Class::getSupportedServiceNames_Static() ) ); \ 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 */ #endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
#define STR_HEADER NC_("STR_HEADER", "Header") #define STR_HEADER NC_("STR_HEADER", "Header")
#define STR_FOOTER NC_("STR_FOOTER", "Footer") #define STR_FOOTER NC_("STR_FOOTER", "Footer")
#define STR_TEXTATTRS NC_("STR_TEXTATTRS", "Text Attributes") #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_PAGE NC_("STR_HFCMD_PAGE", "PAGE")
#define STR_HFCMD_PAGES NC_("STR_HFCMD_PAGES", "PAGES") #define STR_HFCMD_PAGES NC_("STR_HFCMD_PAGES", "PAGES")
#define STR_HFCMD_DATE NC_("STR_HFCMD_DATE", "DATE") #define STR_HFCMD_DATE NC_("STR_HFCMD_DATE", "DATE")
......
...@@ -70,16 +70,6 @@ public: \ ...@@ -70,16 +70,6 @@ public: \
virtual Bitmap createScreenshot() const override; \ virtual Bitmap createScreenshot() const override; \
virtual OString GetScreenshotId() 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) \ #define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \ Class::~Class() \
{ \ { \
...@@ -105,19 +95,6 @@ OString Class::GetScreenshotId() const \ ...@@ -105,19 +95,6 @@ OString Class::GetScreenshotId() const \
return pDlg->GetScreenshotId(); \ 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 class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg
{ {
DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg)
......
...@@ -210,14 +210,6 @@ End ...@@ -210,14 +210,6 @@ End
End End
#endif #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) \ #define LIBO_JAR_FILE(id,name) \
File id \ File id \
TXT_FILE_BODY; \ TXT_FILE_BODY; \
......
...@@ -177,11 +177,6 @@ in this Software without prior written authorization from the X Consortium. ...@@ -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)) #if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(_WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE))
#define FIXUP_CPP_WHITESPACE #define FIXUP_CPP_WHITESPACE
#endif #endif
#ifdef _WIN32
#define REMOVE_CPP_LEADSPACE
#define INLINE_SYNTAX
#define MAGIC_MAKE_VARS
#endif
#ifdef __minix_vmd #ifdef __minix_vmd
#define FIXUP_CPP_WHITESPACE #define FIXUP_CPP_WHITESPACE
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment