[Libreoffice-commits] .: Branch 'feature/gnumake2' - svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source tools/Library_tl.mk tools/Package_inc.mk
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Wed Dec 15 21:41:41 PST 2010
svtools/Library_svt.mk | 4 ++++
svtools/Package_inc.mk | 4 ++++
svtools/inc/filterutils.hxx | 25 -------------------------
svtools/inc/svtools/filterutils.hxx | 25 +++++++++++++++++++++++++
svtools/source/misc/filterutils.cxx | 2 +-
tools/Library_tl.mk | 1 +
tools/Package_inc.mk | 1 +
7 files changed, 36 insertions(+), 26 deletions(-)
New commits:
commit d6aa531f692d9b93a55ca8bd77fae974868d7dc6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Dec 15 23:43:48 2010 -0600
fix missing elements in svt and tl gnumake
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 81761ce..68eaf9c 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -152,6 +152,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/misc/cliplistener \
svtools/source/misc/transfer \
svtools/source/misc/stringtransfer \
+ svtools/source/misc/filterutils \
svtools/source/plugapp/ttprops \
svtools/source/control/ctrlbox \
svtools/source/control/valueacc \
@@ -183,6 +184,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/stdmenu \
svtools/source/control/prgsbar \
svtools/source/control/taskmisc \
+ svtools/source/control/toolbarmenu \
+ svtools/source/control/toolbarmenuacc \
svtools/source/dialogs/insdlg \
svtools/source/dialogs/roadmapwizard \
svtools/source/dialogs/mcvmath \
@@ -247,6 +250,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/uno/treecontrolpeer \
svtools/source/uno/framestatuslistener \
svtools/source/uno/popupmenucontrollerbase \
+ svtools/source/uno/popupwindowcontroller \
svtools/source/uno/wizard/unowizard \
svtools/source/uno/wizard/wizardpagecontroller \
svtools/source/uno/wizard/wizardshell \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 2569694..5a9517b 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -81,6 +81,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/ta
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx))
@@ -108,6 +110,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svto
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filterutils.hxx,svtools/filterutils.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx))
@@ -129,6 +132,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtool
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
diff --git a/svtools/inc/filterutils.hxx b/svtools/inc/filterutils.hxx
deleted file mode 100644
index ac14f92..0000000
--- a/svtools/inc/filterutils.hxx
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef SVTOOLS_INC_FILTERUTILS_HXX
-#define SVTOOLS_INC_FILTERUTILS_HXX
-
-#include "svtools/svtdllapi.h"
-#include <com/sun/star/uno/RuntimeException.hpp>
-namespace svt
-{
- class BinFilterUtils
- {
- private:
- BinFilterUtils(); // never implemented
-
- public:
- SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
- SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
- };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/filterutils.hxx b/svtools/inc/svtools/filterutils.hxx
new file mode 100644
index 0000000..ac14f92
--- /dev/null
+++ b/svtools/inc/svtools/filterutils.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef SVTOOLS_INC_FILTERUTILS_HXX
+#define SVTOOLS_INC_FILTERUTILS_HXX
+
+#include "svtools/svtdllapi.h"
+#include <com/sun/star/uno/RuntimeException.hpp>
+namespace svt
+{
+ class BinFilterUtils
+ {
+ private:
+ BinFilterUtils(); // never implemented
+
+ public:
+ SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+ SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize );
+ };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/filterutils.cxx b/svtools/source/misc/filterutils.cxx
index 578c940..06640c5 100644
--- a/svtools/source/misc/filterutils.cxx
+++ b/svtools/source/misc/filterutils.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#include "filterutils.hxx"
+#include <svtools/filterutils.hxx>
#include <rtl/ustrbuf.hxx>
namespace svt
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 5db5864..55199a7 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/fsys/dirent \
tools/source/fsys/filecopy \
tools/source/fsys/fstat \
+ tools/source/generic/b3dtrans \
tools/source/generic/bigint \
tools/source/generic/color \
tools/source/generic/config \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 92bb020..f0ac044 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -26,6 +26,7 @@
#*************************************************************************
$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/command.hxx,bootstrp/command.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/inimgr.hxx,bootstrp/inimgr.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/listmacr.hxx,bootstrp/listmacr.hxx))
More information about the Libreoffice-commits
mailing list