[Libreoffice-commits] .: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/Helper.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9eb1c0cb7c3ae261d21b7efb30a6dbb1ec21c02f
Author: Tor Lillqvist 
Date:   Sun Feb 26 09:17:05 2012 +0200

Fix typos

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 6700ef8..10dac0b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -30,10 +30,10 @@ gb_Helper_NULLFILE := /dev/null
 
 gb_Helper_MISC := $(WORKDIR)/Misc
 
-# general propose phony target
+# general purpose phony target
 gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
 
-# general propose empty dummy target
+# general purpose empty dummy target
 gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
 
 .PHONY : $(WORKDIR)/Misc/PHONY
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: comphelper/inc comphelper/source

[Matus Kukan]

 comphelper/inc/comphelper/mimeconfighelper.hxx |4 
 comphelper/source/misc/mimeconfighelper.cxx|   18 ++
 2 files changed, 22 insertions(+)

New commits:
commit 21261663205741892f780adeae119402f386ad9e
Author: Matúš Kukan 
Date:   Sun Feb 26 00:03:21 2012 +0100

add AddFilterNameCheckOwnFile back for WNT

diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx 
b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 4ca3ae7..10fcfd1 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -120,6 +120,10 @@ public:
 ::rtl::OUString UpdateMediaDescriptorWithFilterName(
 ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& aMediaDescr,
 ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::NamedValue >& aObject );
+#ifdef WNT
+sal_Bool AddFilterNameCheckOwnFile(
+::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& aMediaDescr );
+#endif
 
 ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& 
aServName, sal_Int32 nVersion );
 
diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index 168c279..72ecd73 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -705,6 +705,24 @@ uno::Sequence< beans::NamedValue > 
MimeConfigurationHelper::GetObjectPropsByDocu
 return UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_True );
 }
 
+#ifdef WNT
+sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
+uno::Sequence< beans::PropertyValue >& aMediaDescr )
+{
+sal_Bool bResult = sal_False;
+
+::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( 
aMediaDescr, sal_False );
+if ( !aFilterName.isEmpty() )
+{
+sal_Int32 nFlags = GetFilterFlags( aFilterName );
+// check the OWN flag
+bResult = ( nFlags & SFX_FILTER_OWN );
+}
+
+return bResult;
+}
+#endif
+
 //---
 ::rtl::OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( 
const ::rtl::OUString& aServiceName, sal_Int32 nVersion )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 3 commits - sdext/CppunitTest_pdfimport.mk sdext/Module_sdext.mk sdext/source

[David Tardon]

 sdext/CppunitTest_pdfimport.mk |   90 ++
 sdext/Module_sdext.mk  |4 
 sdext/source/minimizer/delzip  |1 
 sdext/source/minimizer/minimizer.pmk   |   28 -
 sdext/source/pdfimport/delzip  |1 
 sdext/source/pdfimport/pdfisettings.pmk|   28 -
 sdext/source/pdfimport/test/makefile.mk|  141 -
 sdext/source/pdfimport/test/tests.cxx  |  101 
 sdext/source/pdfimport/wrapper/wrapper.cxx |4 
 sdext/source/presenter/delzip  |1 
 10 files changed, 193 insertions(+), 206 deletions(-)

New commits:
commit 5d44d9fec3aa594e1990e3000fd7c1e2e365a469
Author: David Tardon 
Date:   Sat Feb 25 19:15:09 2012 +0100

the passed string is already quoted

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 807bcdd..27d8567 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -63,7 +63,6 @@
 #include "basegfx/tools/unopolypolygon.hxx"
 
 #include 
-#include 
 #include 
 #include 
 
@@ -1017,8 +1016,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&  
   rUR
 converterURL.insert(
 0,
 xProvider->getPackageLocation(
-rtl::OUString::createFromAscii(
-BOOST_PP_STRINGIZE(PDFI_IMPL_IDENTIFIER;
+rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER)));
 }
 
 // spawn separate process to keep LGPL/GPL code apart.
commit 3acc9127ffa86c90f8916f1d80e5f4b924719692
Author: David Tardon 
Date:   Sat Feb 25 17:18:50 2012 +0100

remove leftover makefiles

diff --git a/sdext/source/minimizer/delzip b/sdext/source/minimizer/delzip
deleted file mode 100644
index 8b13789..000
--- a/sdext/source/minimizer/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sdext/source/minimizer/minimizer.pmk 
b/sdext/source/minimizer/minimizer.pmk
deleted file mode 100644
index f832f2d..000
--- a/sdext/source/minimizer/minimizer.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-EXTENSIONNAME:=PresentationMinimizer
diff --git a/sdext/source/pdfimport/delzip b/sdext/source/pdfimport/delzip
deleted file mode 100644
index e16c76d..000
--- a/sdext/source/pdfimport/delzip
+++ /dev/null
@@ -1 +0,0 @@
-""
diff --git a/sdext/source/pdfimport/pdfisettings.pmk 
b/sdext/source/pdfimport/pdfisettings.pmk
deleted file mode 100644
index b0f6ae4..000
--- a/sdext/source/pdfimport/pdfisettings.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport-$(PLATFORMID)"
diff --git a/sdext/source/presente

[Libreoffice-commits] .: sc/source

[Takeshi Abe]

 sc/source/ui/unoobj/scdetect.cxx   |   22 +++---
 sc/source/ui/vba/vbafilesearch.cxx |2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 552a9862f8a11d8e3b86eef710d91a322a3a2946
Author: Takeshi Abe 
Date:   Sat Feb 25 23:15:00 2012 +0900

Avoid temporary rtl::OUString

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index d9b644f..c1f2795 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -273,22 +273,22 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 for( sal_Int32 nProperty=0; nProperty>= sTemp;
 aURL = sTemp;
 }
-else if( !aURL.Len() && lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
+else if( !aURL.Len() && 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))
 )
 {
 lDescriptor[nProperty].Value >>= sTemp;
 aURL = sTemp;
 }
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName"))
 )
 {
 lDescriptor[nProperty].Value >>= sTemp;
 aTypeName = sTemp;
 }
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName"))
 )
 {
 lDescriptor[nProperty].Value >>= sTemp;
 aPreselectedFilterName = sTemp;
@@ -297,22 +297,22 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 // remember index of property to get access to it later
 nIndexOfFilterName = nProperty;
 }
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))
 )
 nIndexOfInputStream = nProperty;
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ReadOnly"))
 )
 nIndexOfReadOnlyFlag = nProperty;
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UCBContent"))
 )
 nIndexOfContent = nProperty;
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate"))
 )
 {
 lDescriptor[nProperty].Value >>= bOpenAsTemplate;
 nIndexOfTemplateFlag = nProperty;
 }
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler"))
 )
 lDescriptor[nProperty].Value >>= xInteraction;
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RepairPackage"))
 )
 lDescriptor[nProperty].Value >>= bRepairPackage;
-else if( lDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")) )
+else if( 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocumentTitle"))
 )
 nIndexOfDocumentTitle = nProperty;
 }
 
diff --git a/sc/source/ui/vba/vbafilesearch.cxx 
b/sc/source/ui/vba/vbafilesearch.cxx
index 91e8c7a..928ed9a 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -171,7 +171,7 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( )  throw 
(css::uno::RuntimeExceptio
 return 0;
 }
 
-if ( m_sFileName == ::rtl::OUString() )
+if ( m_sFileName.isEmpty() )
 {
 return 1;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/android vcl/headless vcl/inc vcl/unx

[Michael Meeks]

 vcl/android/androidinst.cxx |   89 +---
 vcl/headless/svpframe.cxx   |   39 +
 vcl/headless/svpinst.cxx|5 +-
 vcl/inc/android/androidinst.hxx |5 +-
 vcl/inc/headless/svpframe.hxx   |   11 
 vcl/inc/unx/gtk/gtkframe.hxx|2 
 vcl/unx/gtk/window/gtkframe.cxx |4 +
 7 files changed, 136 insertions(+), 19 deletions(-)

New commits:
commit 9ab611a652334a98ba7922ee6a53b61bbcc4892f
Author: Michael Meeks 
Date:   Sat Feb 25 14:13:08 2012 +

android: move DamageTracker concept into SvpSalFrame and try to use it

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 94d5bbc..af78a22 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 extern void VCL_DLLPUBLIC plasma_now(const char *msg);
 
@@ -203,7 +204,7 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
 const ARect &rSrcRect,
 int nDestX, int nDestY)
 {
-fprintf (stderr, "Blit frame #2 src %d,%d->%d,%d to position %d, %d\n",
+fprintf (stderr, "Blit frame src %d,%d->%d,%d to position %d, %d\n",
  rSrcRect.left, rSrcRect.top, rSrcRect.right, rSrcRect.bottom,
  nDestX, nDestY);
 
@@ -215,11 +216,10 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
 // FIXME: do some cropping goodness on aSrcRect to ensure no overflows etc.
 ARect aSrcRect = rSrcRect;
 
-// FIXME: we have WINDOW_FORMAT_RGB_565= 4 ...
-
+// FIXME: by default we have WINDOW_FORMAT_RGB_565 = 4 ...
 for (unsigned int y = 0; y < (unsigned int)(aSrcRect.bottom - 
aSrcRect.top); y++)
 {
-unsigned char *sp = ( pSrc + nStride * (aSrcRect.bottom - aSrcRect.top 
- y - 1) +
+unsigned char *sp = ( pSrc + nStride * (aSrcRect.top + y) +
   aSrcRect.left * 3 /* src pixel size */ );
 
 switch (pOutBuffer->format) {
@@ -258,7 +258,6 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
 break;
 }
 }
-fprintf (stderr, "done blit!\n");
 }
 
 void AndroidSalInstance::BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
@@ -288,7 +287,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 if (aOutBuffer.bits != NULL)
 {
 
-#if 1 // pre-'clean' the buffer with cruft:
+#if 0   // pre-'clean' the buffer with cruft:
 // hard-code / guess at a format ...
 int32_t *p = (int32_t *)aOutBuffer.bits;
 for (int32_t y = 0; y < aOutBuffer.height; y++)
@@ -296,18 +295,42 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 for (int32_t x = 0; x < aOutBuffer.stride; x++)
 *p++ = (y << 24) + (x << 10) + 0xff ;
 }
-#endif
 
+#endif
+int i = 0;
 std::list< SalFrame* >::const_iterator it;
-for ( it = getFrames().begin(); it != getFrames().end(); it++ )
+for ( it = getFrames().begin(); it != getFrames().end(); i++, it++ )
 {
 SvpSalFrame *pFrame = static_cast(*it);
 
 if (pFrame->IsVisible())
 {
-// FIXME: force a re-draw - this appears not to happen much 
otherwis
-pFrame->PostPaint(true);
+fprintf( stderr, "render visible frame %d\n", i );
+#ifndef REGION_RE_RENDER
 BlitFrameToWindow (&aOutBuffer, pFrame->getDevice());
+#else
+// Sadly it seems that due to double buffering, we don't
+// get back in our buffer what we had there last time - so we 
cannot
+// do incremental rendering. Presumably this will require us to
+// render to a bitmap, and keep that updated instead in future.
+
+// Intersect re-rendering region with this frame
+Region aClipped( maRedrawRegion );
+basegfx::B2IVector aDevSize = pFrame->getDevice()->getSize();
+aClipped.Intersect( Rectangle( 0, 0, aDevSize.getX(), 
aDevSize.getY() ) );
+
+Rectangle aSubRect;
+RegionHandle aHdl = aClipped.BeginEnumRects();
+while( aClipped.GetNextEnumRect( aHdl, aSubRect ) )
+{
+ARect aASubRect = { aSubRect.Left(), aSubRect.Top(),
+aSubRect.Right(), aSubRect.Bottom() };
+BlitFrameRegionToWindow(&aOutBuffer, pFrame->getDevice(),
+aASubRect,
+aSubRect.Left(), aSubRect.Top());
+}
+aClipped.EndEnumRects( aHdl );
+#endif
 }
 }
 }
@@ -316,9 +339,17 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 ANativeWindow_unlockAndPost(pWindow);
 
 fpri

[Libreoffice-commits] .: 3 commits - clucene/prj solenv/gbuild

[Matus Kukan]

 clucene/prj/build.lst  |6 +++---
 solenv/gbuild/gbuild_simple.mk |   18 ++
 solenv/gbuild/partial_build.mk |2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 7e454a3e3dc7f7f85a623ab6a7afab6f40bccaa6
Author: Matúš Kukan 
Date:   Fri Feb 24 23:34:58 2012 +0100

gbuild_simple: add gb_Python and include also Tempfile here

diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 3f7ba29..b05cb8c 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -77,8 +77,26 @@ gb_SYMBOL := $(true)
 endif
 
 include $(GBUILDDIR)/Helper.mk
+include $(GBUILDDIR)/Tempfile.mk
 
 # Include platform/cpu/compiler specific config/definitions
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
+ifeq ($(SYSTEM_PYTHON),YES)
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(OS),MACOSX)
+#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
+#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
+#dirs for in-tree internal python
+gb_PYTHONTARGET :=
+gb_PYTHON := $(PYTHON)
+else ifeq ($(DISABLE_PYTHON),TRUE)
+# Build-time python
+gb_PYTHON := python
+else
+gb_PYTHONTARGET := $(OUTDIR)/bin/python
+gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
+endif
+
 # vim: set noet sw=4 ts=4:
commit 66fdc38fb71e69669d09ff2f05656e5d654d4975
Author: Matúš Kukan 
Date:   Fri Feb 24 23:31:50 2012 +0100

partial_build: make this work also for modules from clone/

diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index ddfbc47..4a390fc 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -5,7 +5,7 @@ ifeq ($(SOLARENV),)
 ifeq ($(gb_Side),)
 gb_Side:=host
 endif
-include $(module_directory)/../config_$(gb_Side).mk
+include $(dir $(realpath $(lastword 
$(MAKEFILE_LIST../../config_$(gb_Side).mk
 endif
 
 include $(SOLARENV)/gbuild/gbuild.mk
commit 48dc8ca4e1784dd6ebec1ab58a3a32651780afc7
Author: Matúš Kukan 
Date:   Fri Feb 24 23:30:11 2012 +0100

make this consistent

diff --git a/clucene/prj/build.lst b/clucene/prj/build.lst
index ef04681..c33dcb2 100644
--- a/clucene/prj/build.lst
+++ b/clucene/prj/build.lst
@@ -1,3 +1,3 @@
-cl cl : ZLIB:zlib BOOST:boost NULL
-cl cl  usr1-   all cl_mkout NULL
-cl cl\prj  nmake   -   all cl_prj NULL
+cl clucene : ZLIB:zlib BOOST:boost NULL
+cl clucene usr1-   all cl_mkout NULL
+cl clucene\prj nmake   -   all cl_prj NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - sdext/Library_pdfimport.mk

[David Tardon]

 sdext/Library_pdfimport.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc2cbaf95386a44b225d0ee25ce4ddf4a9e239c5
Author: David Tardon 
Date:   Sat Feb 25 11:50:22 2012 +0100

the include must be at the beginning

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index e04c2eb..485a14a 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -25,6 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
+
 $(eval $(call gb_Library_Library,pdfimport))
 
 $(eval $(call gb_Library_add_api,pdfimport,\
@@ -32,8 +34,6 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
-
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 6 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Library_pdfimport.mk sdext/source sole

[David Tardon]

 dev/null  |binary
 sdext/Extension_minimizer.mk  |4 
 sdext/Extension_pdfimport.mk  |2 
 sdext/Extension_presenter.mk  |   10 
 sdext/Library_pdfimport.mk|4 
 sdext/source/presenter/PresenterClock.cxx | 1287 --
 sdext/source/presenter/PresenterClock.hxx |  196 
 solenv/gbuild/Extension.mk|5 
 8 files changed, 16 insertions(+), 1492 deletions(-)

New commits:
commit e36d981aa7b88d841f6d1325797083d4df026987
Author: David Tardon 
Date:   Sat Feb 25 11:44:22 2012 +0100

fix platform ID

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index f59d988..e04c2eb 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-include $(OUTDIR)/inc/rtlbootstrap.mk
+include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
 
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
--DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\" \
+-DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
 ))
 
 $(eval $(call gb_Library_add_package_headers,pdfimport,\
commit 8e5cb35f9b6e0934ee388bfa049a55bea1658515
Author: David Tardon 
Date:   Sat Feb 25 09:45:51 2012 +0100

remove unused bitmap

diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png
deleted file mode 100644
index 65073e4..000
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
and /dev/null differ
commit 0d585549d91b7c48f4e846006680289c52102bf3
Author: David Tardon 
Date:   Sat Feb 25 09:45:14 2012 +0100

remove unused sources

diff --git a/sdext/source/presenter/PresenterClock.cxx 
b/sdext/source/presenter/PresenterClock.cxx
deleted file mode 100644
index f176b8b..000
--- a/sdext/source/presenter/PresenterClock.cxx
+++ /dev/null
@@ -1,1287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include "PresenterClock.hxx"
-#include "PresenterComponent.hxx"
-#include "PresenterConfigurationAccess.hxx"
-#include "PresenterGeometryHelper.hxx"
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
-using ::rtl::OUString;
-
-namespace sdext { namespace presenter {
-
-/** Wrapper around a library timer.
-*/
-class PresenterClock::Timer : public salhelper::Timer
-{
-public:
-explicit Timer (const ::rtl::Reference& rpClock);
-virtual ~Timer (void);
-
-void Stop (void);
-
-protected:
-virtual void SAL_CALL onShot (void);
-
-private:
-::rtl::Reference mpClock;
-};
-
-namespace {
-bool GetDateTime (oslDateTime& rDateTime);
-
-class BitmapDescriptor
-{
-public:
-Reference mxBitmap;
-awt::Point maOffset;
-Reference mxScaledBitmap;
-geometry::RealPoint2D maScaledOffset;
-};
-}
-
-class PresenterClock::Painter
-{
-public:
-virtual void Paint (
-const Reference& rxCanvas,
-const rendering::ViewState& rViewState,
-const rendering::RenderState& rRenderState,
-const util::Color& rBackgroundColor,
-const sal_Int32 nHour,
-const sal_Int32 nMinute,
-const sal_Int32 nSecond,
-const bool bShowSeconds) = 0;
-virtual void Resize (const awt::Size& rSize) = 0;
-};
-
-namespace {
-class AnalogDefaultP