subject:"\[Libreoffice\-commits\] .\: sdext\/source"

[Libreoffice-commits] .: sdext/source

2012-04-23 Thread David Tardon

 sdext/source/presenter/PresenterComponent.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 1f1f8ac4db7aa40f299a104927499e72d39fd932
Author: David Tardon 
Date:   Tue Apr 24 07:24:18 2012 +0200

remove leftover component_writeInfo

diff --git a/sdext/source/presenter/PresenterComponent.cxx 
b/sdext/source/presenter/PresenterComponent.cxx
index b73d617..581427c 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -106,12 +106,6 @@ extern "C"
 return g_moduleCount.canUnload( &g_moduleCount , pTime );
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-void * pServiceManager, void * pRegistryKey )
-{
-return component_writeInfoHelper(pServiceManager, pRegistryKey, 
gServiceEntries);
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 const sal_Char * pImplName, void * pServiceManager, void * 
pRegistryKey )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-04-21 Thread Caolán McNamara

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcb4defef7c9147a94ef19a51a18715449d3572d
Author: Korrawit Pruegsanusak 
Date:   Sat Apr 21 10:06:19 2012 +0700

Fix fdo#45848

regression from 5dd4f9ecb2f50cf76b44472e4438297b6c65184c
The change:
-if(m_GlyphsList.size()>1)
+if(!m_GlyphsList.empty())
is incorrect, so change it back.

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index d0ec397..12d2ab4 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -399,7 +399,7 @@ void PDFIProcessor::processGlyphLine()
 
 }
 
-if(!m_GlyphsList.empty())
+if(m_GlyphsList.size()>1)
  processGlyph( 0,
   m_GlyphsList[m_GlyphsList.size()-1],
   pPara,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-03-21 Thread Fridrich Strba

 sdext/source/presenter/PresenterSprite.cxx |2 --
 sdext/source/presenter/PresenterSprite.hxx |1 -
 2 files changed, 3 deletions(-)

New commits:
commit e55595d0e081ccdca41f621177e1b32eb9a649e3
Author: Christina Rossmanith 
Date:   Tue Mar 20 20:35:01 2012 +0100

maTransform had to go ( was always = identity)

diff --git a/sdext/source/presenter/PresenterSprite.cxx 
b/sdext/source/presenter/PresenterSprite.cxx
index aa396eb..2164566 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -44,7 +44,6 @@ PresenterSprite::PresenterSprite (void)
   mxSprite(),
   maSize(0,0),
   maLocation(0,0),
-  maTransform(1,0,0, 0,1,0),
   mbIsVisible(false),
   mnPriority(0),
   mnAlpha(1.0)
@@ -142,7 +141,6 @@ void PresenterSprite::ProvideSprite (void)
 mxSprite = mxSpriteFactory->createCustomSprite(maSize);
 if (mxSprite.is())
 {
-mxSprite->transform(maTransform);
 mxSprite->move(maLocation,
 rendering::ViewState(
 geometry::AffineMatrix2D(1,0,0, 0,1,0),
diff --git a/sdext/source/presenter/PresenterSprite.hxx 
b/sdext/source/presenter/PresenterSprite.hxx
index 2896712..0478d43 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -73,7 +73,6 @@ private:
 ::css::uno::Reference mxSprite;
 css::geometry::RealSize2D maSize;
 css::geometry::RealPoint2D maLocation;
-css::geometry::AffineMatrix2D maTransform;
 bool mbIsVisible;
 double mnPriority;
 double mnAlpha;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source unusedcode.easy

2012-03-20 Thread Caolán McNamara

 sdext/source/presenter/PresenterAnimation.cxx |   31 --
 sdext/source/presenter/PresenterAnimation.hxx |   17 --
 sdext/source/presenter/PresenterAnimator.cxx  |   11 -
 sdext/source/presenter/PresenterAnimator.hxx  |8 --
 unusedcode.easy   |4 ---
 5 files changed, 2 insertions(+), 69 deletions(-)

New commits:
commit fdd18639075f6ac7b3ec2ff735e7de2bdf550964
Author: Christina Rossmanith 
Date:   Tue Mar 20 13:51:48 2012 +

Remove unused code (sdext)

diff --git a/sdext/source/presenter/PresenterAnimation.cxx 
b/sdext/source/presenter/PresenterAnimation.cxx
index cacf98d..b5c30ec 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -47,9 +47,7 @@ PresenterAnimation::PresenterAnimation (
 const sal_uInt64 nStepDuration)
 : mnStartTime(GetCurrentTime()+nStartDelay),
   mnTotalDuration(nTotalDuration),
-  mnStepDuration(nStepDuration),
-  mpStartCallbacks(),
-  mpEndCallbacks()
+  mnStepDuration(nStepDuration)
 {
 }
 
@@ -72,33 +70,6 @@ sal_uInt64 PresenterAnimation::GetStepDuration (void)
 return mnStepDuration;
 }
 
-void PresenterAnimation::AddEndCallback (const Callback& rCallback)
-{
-if (mpEndCallbacks.get() == NULL)
-mpEndCallbacks.reset(new ::std::vector());
-mpEndCallbacks->push_back(rCallback);
-}
-
-void PresenterAnimation::RunStartCallbacks (void)
-{
-if (mpStartCallbacks.get() != NULL)
-{
-::std::vector::const_iterator iCallback;
-for (iCallback=mpStartCallbacks->begin(); 
iCallback!=mpStartCallbacks->end(); ++iCallback)
-(*iCallback)();
-}
-}
-
-void PresenterAnimation::RunEndCallbacks (void)
-{
-if (mpEndCallbacks.get() != NULL)
-{
-::std::vector::const_iterator iCallback;
-for (iCallback=mpEndCallbacks->begin(); 
iCallback!=mpEndCallbacks->end(); ++iCallback)
-(*iCallback)();
-}
-}
-
 } } // end of namespace ::sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx 
b/sdext/source/presenter/PresenterAnimation.hxx
index fdd8de6..8c2ce42 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -83,11 +83,6 @@ public:
 
 typedef ::boost::function Callback;
 
-/** Add a callback that is executed after Run() is called for the last
-time.
-*/
-void AddEndCallback (const Callback& rCallback);
-
 /** Called with nProgress taking on values between 0 and 1.
 @param nProgress
 A value between 0 and 1.
@@ -96,22 +91,10 @@ public:
 */
 virtual void Run (const double nProgress, const sal_uInt64 nCurrentTime) = 
0;
 
-/** Called just before Run() is called for the first time to trigger the
-callbacks registered via the AddStartCallback().
-*/
-void RunStartCallbacks (void);
-
-/** Called just after Run() is called for the last time to trigger the
-callbacks registered via the AddEndCallback().
-*/
-void RunEndCallbacks (void);
-
 private:
 const sal_uInt64 mnStartTime;
 const sal_uInt64 mnTotalDuration;
 const sal_uInt64 mnStepDuration;
-::boost::scoped_ptr > mpStartCallbacks;
-::boost::scoped_ptr > mpEndCallbacks;
 };
 
 sal_uInt64 GetCurrentTime (void);
diff --git a/sdext/source/presenter/PresenterAnimator.cxx 
b/sdext/source/presenter/PresenterAnimator.cxx
index 55c9fd5..a401c2a 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -52,14 +52,6 @@ PresenterAnimator::~PresenterAnimator (void)
 PresenterTimer::CancelTask(mnCurrentTaskId);
 }
 
-void PresenterAnimator::AddAnimation (const SharedPresenterAnimation& 
rpAnimation)
-{
-::osl::MutexGuard aGuard (m_aMutex);
-
-
maFutureAnimations.insert(AnimationList::value_type(rpAnimation->GetStartTime(),
 rpAnimation));
-ScheduleNextRun();
-}
-
 void PresenterAnimator::Process (void)
 {
 ::osl::MutexGuard aGuard (m_aMutex);
@@ -96,8 +88,6 @@ void PresenterAnimator::Process (void)
 AnimationList::value_type(
 nCurrentTime + pAnimation->GetStepDuration(),
 pAnimation));
-else
-pAnimation->RunEndCallbacks();
 }
 
 ScheduleNextRun();
@@ -111,7 +101,6 @@ void PresenterAnimator::ActivateAnimations (const 
sal_uInt64 nCurrentTime)
 SharedPresenterAnimation pAnimation 
(maFutureAnimations.begin()->second);
 maActiveAnimations.insert(*maFutureAnimations.begin());
 maFutureAnimations.erase(maFutureAnimations.begin());
-pAnimation->RunStartCallbacks();
 }
 }
 
diff --git a/sdext/source/presenter/PresenterAnimator.hxx 
b/sdext/source/presenter/PresenterAnimator.hxx
index 073592b..2ee3522 100644
--- a/sdext/source/presenter/PresenterAnimator.hxx
+++ b/sdext/sou

[Libreoffice-commits] .: sdext/source

2012-03-20 Thread Caolán McNamara

 sdext/source/presenter/PresenterWindowManager.cxx |   11 ---
 sdext/source/presenter/PresenterWindowManager.hxx |2 --
 2 files changed, 13 deletions(-)

New commits:
commit 591e0fc5e9e10853215ade7d0df397995fafbeac
Author: Christina Rossmanith 
Date:   Wed Mar 14 19:50:29 2012 +0100

Remove unused code

diff --git a/sdext/source/presenter/PresenterWindowManager.cxx 
b/sdext/source/presenter/PresenterWindowManager.cxx
index 5dceffc..d25358f 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -1168,17 +1168,6 @@ void PresenterWindowManager::Invalidate (void)
 {
 mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow);
 }
-
-Reference PresenterWindowManager::GetParentWindow (void) const
-{
-return mxParentWindow;
-}
-
-Reference PresenterWindowManager::GetParentCanvas (void) 
const
-{
-return mxParentCanvas;
-}
-
 void PresenterWindowManager::Update (void)
 {
 mxClipPolygon = NULL;
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx 
b/sdext/source/presenter/PresenterWindowManager.hxx
index 3051c38..d2a5ae2 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -97,8 +97,6 @@ public:
 const double nWidth,
 const double nHeight);
 void SetPaneBorderPainter (const 
::rtl::Reference& rPainter);
-css::uno::Reference GetParentWindow (void) const;
-css::uno::Reference GetParentCanvas (void) const;
 void Update (void);
 void Layout (void);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-03-20 Thread Petr Mladek

 sdext/source/minimizer/optimizerdialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9481eb32e76568fc675982479cc07c57c6a7cb39
Author: Julien Nabet 
Date:   Tue Mar 20 14:21:22 2012 +0100

cppcheck report: logical disjunction always evaluates to true

diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext/source/minimizer/optimizerdialog.cxx
index a7076a0..78afa98 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -273,7 +273,7 @@ sal_Bool OptimizerDialog::execute()
 
 void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
 {
-if ( ( nNewStep != mnCurrentStep ) && ( ( nNewStep <= MAX_STEP ) || ( 
nNewStep >= 0 ) ) )
+if ( ( nNewStep != mnCurrentStep ) && ( nNewStep <= MAX_STEP ) && ( 
nNewStep >= 0 ) )
 {
 sal_Int16 nOldStep = mnCurrentStep;
 if ( nNewStep == 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-03-16 Thread Lubos Lunak

 sdext/source/pdfimport/test/tests.cxx |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit f15023d34037068147f6afe83a187b2fb515351b
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Mar 16 20:06:59 2012 +0100

do not let a unittest create temp files in the current directory

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index d3fa3e7..b73da1d 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -596,15 +596,14 @@ namespace
 pdfi::PDFIRawAdaptor aAdaptor( impl_getComponentContext() );
 aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() );
 
-::rtl::OUString aURL, aAbsURL, aBaseURL;
-osl_getFileURLFromSystemPath( 
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_draw.xml"))).pData,
-  &aURL.pData );
-osl_getProcessWorkingDir(&aBaseURL.pData);
-osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData);
+::rtl::OUString tempFileURL;
+CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, 
&tempFileURL ) == osl::File::E_None );
+osl::File::remove( tempFileURL ); // FIXME the below apparently 
fails silently if the file already exists
 CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
aAdaptor.odfConvert( 
getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
-new 
OutputWrap(aAbsURL),
+new 
OutputWrap(tempFileURL),
 NULL ));
+osl::File::remove( tempFileURL );
 }
 
 void testOdfWriterExport()
@@ -612,15 +611,14 @@ namespace
 pdfi::PDFIRawAdaptor aAdaptor( impl_getComponentContext() );
 aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() );
 
-::rtl::OUString aURL, aAbsURL, aBaseURL;
-osl_getFileURLFromSystemPath( 
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_writer.xml"))).pData,
-  &aURL.pData );
-osl_getProcessWorkingDir(&aBaseURL.pData);
-osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData);
+::rtl::OUString tempFileURL;
+CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, 
&tempFileURL ) == osl::File::E_None );
+osl::File::remove( tempFileURL ); // FIXME the below apparently 
fails silently if the file already exists
 CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
aAdaptor.odfConvert( 
getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
-new 
OutputWrap(aAbsURL),
+new 
OutputWrap(tempFileURL),
 NULL ));
+osl::File::remove( tempFileURL );
 }
 
 CPPUNIT_TEST_SUITE(PDFITest);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-03-10 Thread Lubos Lunak

 sdext/source/pdfimport/test/tests.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit df6097ab4fc7008997caa93fb6674b1e2599e227
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Mar 10 22:27:38 2012 +0100

operator must be in template or argument namespace

clang has more strict (and probably more spec compliant) lookup

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index a98600c..d3fa3e7 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -87,15 +87,18 @@ using namespace ::pdfparse;
 using namespace ::pdfi;
 using namespace ::com::sun::star;
 
-namespace
+namespace rtl
 {
-
 template< typename charT, typename traits > std::basic_ostream &
 operator <<(
 std::basic_ostream & stream, rtl::OString const 
& string)
 {
 return stream << string.getStr();
 }
+}
+
+namespace
+{
 
 class TestSink : public ContentSink
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-03-08 Thread Tor Lillqvist

 sdext/source/pdfimport/test/tests.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit bcdb2f161ec9b76ce65d608756c9aecddfe15ac2
Author: Tor Lillqvist 
Date:   Thu Mar 8 17:02:31 2012 +0200

Fix Windows compilation errors caused by int/sal_Int32 borkage

Unfortunately the unit test in question still fails on Windows,
though.

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index c4d7fc5..a98600c 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -121,7 +121,7 @@ namespace
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of 
points): Width", m_aPageSize.Width, 79400, 0.0001);
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of 
points): Height" , m_aPageSize.Height, 59500, 0.001 );
 CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, 
1 );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, 
(sal_Int32) 1 );
 CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
 
rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
 
rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
@@ -306,7 +306,7 @@ namespace
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "Flatness is 0",
 rContext.Flatness, 1, 0.0001 );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font id is 0",
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
 }
 
 virtual void fillPath( const 
uno::Reference& rPath )
@@ -325,7 +325,7 @@ namespace
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "Flatness is 10",
 rContext.Flatness, 10, 0.0001 );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font id is 0",
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
 }
 
 virtual void eoFillPath( const 
uno::Reference& rPath )
@@ -344,7 +344,7 @@ namespace
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "Flatness is 0",
 rContext.Flatness, 1, 0.0001 );
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font id is 0",
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
 
 const char* sExportString = "m12050 49610c-4310 
0-7800-3490-7800-7800 0-4300 "
 "3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490 
7800-7790 7800z";
@@ -392,7 +392,7 @@ namespace
   bool   
/*bInvert*/ )
 {
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties",
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
 CPPUNIT_ASSERT_MESSAGE( "drawMask got URL param",
 xBitmap[0].Name.compareToAscii( "URL" ) == 
0 );
 CPPUNIT_ASSERT_MESSAGE( "drawMask got InputStream param",
@@ -402,7 +402,7 @@ namespace
 virtual void drawImage(const uno::Sequence& 
xBitmap )
 {
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage received two properties",
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
 CPPUNIT_ASSERT_MESSAGE( "drawImage got URL param",
 xBitmap[0].Name.compareToAscii( "URL" ) == 
0 );
 CPPUNIT_ASSERT_MESSAGE( "drawImage got InputStream param",
@@ -413,7 +413,7 @@ namespace
   const uno::Sequence&   
  /*xMaskColors*/ )
 {
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage received two 
properties",
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
 CPPUNIT_ASSERT_MESSAGE( "drawColorMaskedImage got URL param",
 xBitmap[0].Name.compareToAscii( "URL" ) == 
0 );
 CPPUNIT_ASSERT_MESSAGE( "drawColorMaskedImage got InputStream 
param",
@@ -425,14 +425,14 @@ namespace
  bool  
 /*bInvertMask*/)
 {
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two 
properties #1",
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
 CPPUNIT_ASSERT_MESSAGE( "drawMaskedImage got

[Libreoffice-commits] .: sdext/source

2012-03-06 Thread David Tardon

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e24911bc95935070953cb3b44efdcfa36fae718e
Author: David Tardon 
Date:   Wed Mar 7 08:45:50 2012 +0100

use const_iterator

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 985e5f0..d0ec397 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -824,7 +824,7 @@ void PDFIProcessor::emit( XmlEmitter&   
rEmitter,
 rVisitorFactory.createOptimizingVisitor(*this));
 // FIXME: localization
 startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
-m_pDocument->visitedBy( *optimizingVisitor, 
std::list::iterator());
+m_pDocument->visitedBy( *optimizingVisitor, 
std::list::const_iterator());
 
 #if OSL_DEBUG_LEVEL > 1
 m_pDocument->emitStructure( 0 );
@@ -836,7 +836,7 @@ void PDFIProcessor::emit( XmlEmitter&   
rEmitter,
 rVisitorFactory.createStyleCollectingVisitor(aStyles,*this));
 // FIXME: localization
 
-m_pDocument->visitedBy( *finalizingVisitor, 
std::list::iterator() );
+m_pDocument->visitedBy( *finalizingVisitor, 
std::list::const_iterator() );
 
 EmitContext aContext( rEmitter, aStyles, m_aImages, *this, 
m_xStatusIndicator, m_xContext );
 ElementTreeVisitorSharedPtr aEmittingVisitor(
@@ -871,7 +871,7 @@ void PDFIProcessor::emit( XmlEmitter&   
rEmitter,
 // emit style list
 aStyles.emit( aContext, *aEmittingVisitor );
 
-m_pDocument->visitedBy( *aEmittingVisitor, std::list::iterator() 
);
+m_pDocument->visitedBy( *aEmittingVisitor, 
std::list::const_iterator() );
 aContext.rEmitter.endTag( "office:document" );
 endIndicator();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-02-10 Thread Kohei Yoshida

 sdext/source/pdfimport/inc/pdfparse.hxx  |3 +
 sdext/source/pdfimport/pdfparse/pdfparse.cxx |   57 +--
 2 files changed, 57 insertions(+), 3 deletions(-)

New commits:
commit bc99c90e88ba9f5376ffde9bd4b4b2fa99d6ddf3
Author: Kohei Yoshida 
Date:   Fri Feb 10 14:48:36 2012 -0500

This method is still used on WIN32.

diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx 
b/sdext/source/pdfimport/inc/pdfparse.hxx
index 8f715e9..df3e425 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -304,6 +304,9 @@ class PDFReader
 ~PDFReader() {}
 
 PDFEntry* read( const char* pFileName );
+#ifdef WIN32
+PDFEntry* read( const char* pBuffer, unsigned int nLen );
+#endif
 };
 
 } // namespace
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx 
b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index e5cae10..32dc0ef 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -556,9 +556,60 @@ public:
 }
 };
 
+#ifdef WIN32
+PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
+{
+PDFGrammar aGrammar( pBuffer );
+
+try
+{
+#if OSL_DEBUG_LEVEL > 1
+boost::spirit::parse_info aInfo =
+#endif
+boost::spirit::parse( pBuffer,
+  pBuffer+nLen,
+  aGrammar,
+  boost::spirit::space_p );
+#if OSL_DEBUG_LEVEL > 1
+fprintf( stderr, "parseinfo: stop = %p (buff=%p, offset = %d), hit = 
%s, full = %s, length = %d\n",
+ aInfo.stop, pBuffer, aInfo.stop - pBuffer,
+ aInfo.hit ? "true" : "false",
+ aInfo.full ? "true" : "false",
+ (int)aInfo.length );
+#endif
+}
+catch( const parser_error& rError )
+{
+#if OSL_DEBUG_LEVEL > 1
+fprintf( stderr, "parse error: %s at buffer pos %u\nobject stack:\n",
+ rError.descriptor, rError.where - pBuffer );
+unsigned int nElem = aGrammar.m_aObjectStack.size();
+for( unsigned int i = 0; i < nElem; i++ )
+{
+fprintf( stderr, "   %s\n", typeid( *(aGrammar.m_aObjectStack[i]) 
).name() );
+}
+#endif
+}
+
+PDFEntry* pRet = NULL;
+unsigned int nEntries = aGrammar.m_aObjectStack.size();
+if( nEntries == 1 )
+{
+pRet = aGrammar.m_aObjectStack.back();
+aGrammar.m_aObjectStack.pop_back();
+}
+#if OSL_DEBUG_LEVEL > 1
+else if( nEntries > 1 )
+fprintf( stderr, "error got %u stack objects in parse\n", nEntries );
+#endif
+
+return pRet;
+}
+#endif
+
 PDFEntry* PDFReader::read( const char* pFileName )
 {
-#ifdef WIN32
+#ifdef WIN32
 /* #i106583#
since converting to boost 1.39 file_iterator does not work anymore on 
all Windows systems
C++ stdlib istream_iterator does not allow "-" apparently
@@ -584,7 +635,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
 fclose( fp );
 }
 return pRet;
-#else
+#else
 file_iterator<> file_start( pFileName );
 if( ! file_start )
 return NULL;
@@ -644,7 +695,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
 }
 #endif
 return pRet;
-#endif // WIN32
+#endif // WIN32
 }
 
 #if defined __SUNPRO_CC
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-01-23 Thread Caolán McNamara

 sdext/source/presenter/PresenterTimer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9ca381275f42a445a7c8918230c6263258e53c6
Author: Mariusz Dykierek 
Date:   Mon Jan 23 12:58:10 2012 +

A copy-paste bug detected by cppcheck

diff --git a/sdext/source/presenter/PresenterTimer.cxx 
b/sdext/source/presenter/PresenterTimer.cxx
index 6c5f8d9..3757bd0 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -511,7 +511,7 @@ void PresenterClockTimer::CheckCurrentTime (const 
TimeValue& rCurrentTime)
 {
 if (aDateTime.Seconds != maDateTime.Seconds
 || aDateTime.Minutes != maDateTime.Minutes
-|| aDateTime.Seconds != maDateTime.Seconds)
+|| aDateTime.Hours != maDateTime.Hours)
 {
 // The displayed part of the current time has changed.
 // Prepare to call the listeners.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source sfx2/qa sfx2/source shell/source soltools/adjustvisibility sot/source starmath/source

2011-12-25 Thread Takeshi Abe

 sdext/source/pdfimport/pdfiadaptor.cxx  |2 +-
 sdext/source/pdfimport/pdfparse/pdfparse.cxx|4 ++--
 sdext/source/presenter/PresenterConfigurationAccess.cxx |4 ++--
 sdext/source/presenter/PresenterScreen.cxx  |5 ++---
 sfx2/qa/cppunit/test_metadatable.cxx|4 ++--
 sfx2/source/appl/appserv.cxx|2 +-
 sfx2/source/appl/workwin.cxx|4 ++--
 sfx2/source/doc/objserv.cxx |2 +-
 sfx2/source/doc/sfxbasemodel.cxx|2 +-
 sfx2/source/menu/thessubmenu.cxx|6 ++
 sfx2/source/view/ipclient.cxx   |6 +++---
 shell/source/backends/desktopbe/desktopbackend.cxx  |2 +-
 shell/source/tools/lngconvex/lngconvex.cxx  |2 +-
 shell/source/unix/exec/shellexec.cxx|2 +-
 soltools/adjustvisibility/adjustvisibility.cxx  |4 ++--
 sot/source/sdstor/ucbstorage.cxx|   10 +-
 sot/source/unoolestorage/xolesimplestorage.cxx  |2 +-
 starmath/source/mathmlimport.cxx|5 ++---
 starmath/source/smdetect.cxx|2 +-
 19 files changed, 33 insertions(+), 37 deletions(-)

New commits:
commit 5451e9c702afb7c570662c740b33f2481abb7cb1
Author: Takeshi Abe 
Date:   Mon Dec 26 03:38:13 2011 +0900

catch exception by constant reference

diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx 
b/sdext/source/pdfimport/pdfiadaptor.cxx
index a8720de..1fc25d8 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -163,7 +163,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const 
uno::Sequence< beans::Propert
 m_xContext ),
 uno::UNO_QUERY );
 }
-catch(uno::Exception& e)
+catch(const uno::Exception& e)
 {
 (void)e;
 OSL_TRACE( "subfilter exception: %s\n",
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx 
b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index beecd3c..1638f52 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -577,7 +577,7 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned 
int nLen )
  (int)aInfo.length );
 #endif
 }
-catch( parser_error& rError )
+catch( const parser_error& rError )
 {
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "parse error: %s at buffer pos %u\nobject stack:\n",
@@ -657,7 +657,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
  (int)aInfo.length );
 #endif
 }
-catch( parser_error< const char*, file_iterator<> >& rError )
+catch( const parser_error< const char*, file_iterator<> >& rError )
 {
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "parse error: %s at buffer pos %u\nobject stack:\n",
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx 
b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 5bdbed2..36333b0 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -90,7 +90,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
 maNode <<= mxRoot;
 }
 }
-catch (Exception& rException)
+catch (const Exception& rException)
 {
 OSL_TRACE ("caught exception while opening configuration: %s",
 ::rtl::OUStringToOString(rException.Message,
@@ -195,7 +195,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
 return rxNode->getByHierarchicalName(sPathToNode);
 }
 }
-catch (Exception& rException)
+catch (const Exception& rException)
 {
 OSL_TRACE ("caught exception while getting configuration node %s: %s",
 ::rtl::OUStringToOString(sPathToNode, 
RTL_TEXTENCODING_UTF8).getStr(),
diff --git a/sdext/source/presenter/PresenterScreen.cxx 
b/sdext/source/presenter/PresenterScreen.cxx
index f904ab1..82e3fcd 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -511,7 +511,7 @@ void PresenterScreen::SwitchMonitors()
 uno::Any aDisplay;
 aDisplay <<= nNewScreen;
 xProperties->setPropertyValue(A2S("Display"), aDisplay);
-} catch (const uno::Exception &e) {
+} catch (const uno::Exception &) {
 }
 }
 
@@ -873,9 +873,8 @@ void PresenterScreen::ProcessComponent (
 nY+nHeight);
 }
}
-catch (Exception& e)
+catch (const Exception&)
 {
-(void)e;
 OSL_ASSERT(false);
 }
 }
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx 
b/sfx2/qa/cppunit/test_metadatable.cxx
index b23bad2..eb239f7 100644
--- a/sfx2/qa/cppu

[Libreoffice-commits] .: sdext/source unusedcode.easy

2011-12-20 Thread Michael Meeks

 sdext/source/presenter/PresenterCanvasHelper.cxx  |9 -
 sdext/source/presenter/PresenterFrameworkObserver.cxx |   27 ---
 sdext/source/presenter/PresenterFrameworkObserver.hxx |   11 -
 sdext/source/presenter/PresenterSprite.cxx|   52 --
 sdext/source/presenter/PresenterSprite.hxx|2 
 sdext/source/presenter/PresenterTextView.cxx  |  101 
 sdext/source/presenter/PresenterTextView.hxx  |8 -
 sdext/source/presenter/PresenterTheme.cxx |   29 ---
 sdext/source/presenter/PresenterTheme.hxx |3 
 sdext/source/presenter/PresenterToolBar.cxx   |  143 --
 sdext/source/presenter/PresenterToolBar.hxx   |3 
 sdext/source/presenter/PresenterUIPainter.cxx |8 -
 unusedcode.easy   |7 
 13 files changed, 3 insertions(+), 400 deletions(-)

New commits:
commit 29b6eda7e5909106d8325f75b3ae0cda579385b5
Author: Michael Meeks 
Date:   Tue Dec 20 15:50:43 2011 +

remove un-used code, and make a start at rampant vspace wasting

diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx 
b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 07a0e19..5dccb6c 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -52,16 +52,10 @@ PresenterCanvasHelper::PresenterCanvasHelper (void)
 {
 }
 
-
-
-
 PresenterCanvasHelper::~PresenterCanvasHelper (void)
 {
 }
 
-
-
-
 void PresenterCanvasHelper::Paint (
 const SharedBitmapDescriptor& rpBitmap,
 const css::uno::Reference& rxCanvas,
@@ -73,9 +67,6 @@ void PresenterCanvasHelper::Paint (
 maDefaultViewState, maDefaultRenderState);
 }
 
-
-
-
 void PresenterCanvasHelper::PaintRectangle (
 const SharedBitmapDescriptor& rpBitmap,
 const css::uno::Reference& rxCanvas,
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx 
b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 0131e97..5d6a900 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -95,35 +95,11 @@ void PresenterFrameworkObserver::RunOnUpdateEnd (
 rAction);
 }
 
-
-
-
-bool PresenterFrameworkObserver::HasResource (
-const 
css::uno::Reference&rxController,
-const css::uno::Reference& 
rxResourceId)
-{
-return rxController.is() && rxController->getResource(rxResourceId).is();
-}
-
-
-
-
 bool PresenterFrameworkObserver::True (void)
 {
 return true;
 }
 
-
-
-
-bool PresenterFrameworkObserver::False (void)
-{
-return false;
-}
-
-
-
-
 void SAL_CALL PresenterFrameworkObserver::disposing (void)
 {
 if ( ! maAction.empty())
@@ -131,9 +107,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (void)
 Shutdown();
 }
 
-
-
-
 void PresenterFrameworkObserver::Shutdown (void)
 {
 maAction = Action();
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx 
b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 3612f54..f0062b8 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -94,20 +94,9 @@ private:
 
 void Shutdown (void);
 
-/** Predicate that returns true when the specified resource is active
-with respect to the given configuration controller.
-*/
-static bool HasResource (
-const 
css::uno::Reference&rxController,
-const css::uno::Reference& 
rxResourceId);
-
 /** Predicate that always returns true.
 */
 static bool True (void);
-
-/** Predicate that always returns false.
-*/
-static bool False (void);
 };
 
 
diff --git a/sdext/source/presenter/PresenterSprite.cxx 
b/sdext/source/presenter/PresenterSprite.cxx
index 807503c..526d9d1 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -52,9 +52,6 @@ PresenterSprite::PresenterSprite (void)
 {
 }
 
-
-
-
 PresenterSprite::~PresenterSprite (void)
 {
 if (mxSprite.is())
@@ -67,9 +64,6 @@ PresenterSprite::~PresenterSprite (void)
 }
 }
 
-
-
-
 void PresenterSprite::SetFactory (
 const ::css::uno::Reference& 
rxSpriteFactory)
 {
@@ -82,9 +76,6 @@ void PresenterSprite::SetFactory (
 }
 }
 
-
-
-
 ::css::uno::Reference PresenterSprite::GetCanvas 
(void)
 {
 ProvideSprite();
@@ -94,9 +85,6 @@ void PresenterSprite::SetFactory (
 return NULL;
 }
 
-
-
-
 void PresenterSprite::Show (void)
 {
 mbIsVisible = true;
@@ -106,9 +94,6 @@ void PresenterSprite::Show (void)
 ProvideSprite();
 }
 
-
-
-
 void PresenterSprite::Hide (void)
 {
 mbIsVisible = false;
@@ -116,19 +101,6 @@ void PresenterSprite::Hide (void)
 mxSprite->hide();
 }
 
-
-
-
-void PresenterSprite::SetPriority (const double nPriority)
-{
-mnPriority = nPriority;
-if (mxSprite.is())
-mxSprite->setPriority(mnPriority);
-}
-
-
-
-
 void Pres

[Libreoffice-commits] .: sdext/source

2011-12-19 Thread Andras Timar

 sdext/source/minimizer/makefile.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8f480ee6289bc0a4e8100957789fce0966c7e5a9
Author: Andras Timar 
Date:   Mon Dec 19 15:42:04 2011 +0100

fix racecondition in sdext/source/minimizer/makefile.mk

diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index f28b41e..ea9e043 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -146,10 +146,13 @@ $(DESCRIPTION_SRC) : description.xml
 $(COPY) $< $@
 .ENDIF
 
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
+
+$(MISC)/descriptions : $(DESCRIPTION)
 $(COPY) description-en-US.txt $(EXTENSIONDIR)
 .IF "$(WITH_LANG)" != ""
 $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
 .ENDIF
+$(TOUCH) $@
 
 .ENDIF # L10N_framework
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-12-07 Thread Michael Meeks

 sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png  |binary
 sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png |binary
 sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png|binary
 3 files changed

New commits:
commit 1671c16d6081db4516b62838ab365c1f41951b12
Author: Stefan Knorr (astron) 
Date:   Wed Dec 7 11:19:12 2011 +

much improved presenter console monitor switch artwork

diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png
index 653dffe..65073e4 100644
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
and b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png differ
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png
index f567516..bc1055a 100644
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png 
and b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png differ
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png
index 3ca0f6f..8cfe81d 100644
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png and 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-12-05 Thread Michael Meeks

 sdext/source/presenter/PresenterProtocolHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ccc0361bf3a0be5a123679e6086bc4a03ab1d7b
Author: Michael Meeks 
Date:   Mon Dec 5 22:30:19 2011 +

WaE: fix Mac build wrt. fprintf

diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx 
b/sdext/source/presenter/PresenterProtocolHandler.cxx
index c801462..46668b3 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -613,7 +613,7 @@ SwitchMonitorCommand::SwitchMonitorCommand (
 
 void SwitchMonitorCommand::Execute (void)
 {
-fprintf (stderr, "Switch monitor !\n");
+//fprintf (stderr, "Switch monitor !\n");
 }
 
 //= SetNotesViewCommand ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-12-01 Thread Markus Mohrhard

 sdext/source/pdfimport/tree/writertreevisiting.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf58b6f81d042783fd9bf79d66deaf974565ea45
Author: Markus Mohrhard 
Date:   Thu Dec 1 12:29:10 2011 +0100

fix typo

diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx 
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 310c133..c8101f9 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -759,7 +759,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& 
rParent)
 if( !bRotatedFrame
 && ! rCurGC.isRotatedOrSkewed()
 && ! rNextGC.isRotatedOrSkewed()
-&& pNext->Text.gerLength() > 0
+&& pNext->Text.getLength() > 0
 && pNext->Text[0] != sal_Unicode(' ')
 && pCur->Text.getLength() >  0
 && pCur->Text[pCur->Text.getLength() - 1] != sal_Unicode(' 
')
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-11-25 Thread Thorsten Behrens

 sdext/source/pdfimport/test/export.map  |2 
 sdext/source/pdfimport/test/makefile.mk |   28 +--
 sdext/source/pdfimport/test/tests.cxx   |   80 
 3 files changed, 25 insertions(+), 85 deletions(-)

New commits:
commit b0e1f784080a0f78689b8166f296069c7c2fb8ad
Author: Thorsten Behrens 
Date:   Fri Nov 25 16:43:02 2011 +0100

First cut at making pdfimport unit tests work again.

diff --git a/sdext/source/pdfimport/test/export.map 
b/sdext/source/pdfimport/test/export.map
index 7321bbc..3308588 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
 global:
-registerAllTestFunction;
+cppunitTestPlugIn;
 
 local:
 *;
diff --git a/sdext/source/pdfimport/test/makefile.mk 
b/sdext/source/pdfimport/test/makefile.mk
index b6f60d5..fdc3966 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -70,6 +70,8 @@ SHL1STDLIBS=\
 $(CPPUNITLIB)  \
 $(ZLIB3RDLIB)  \
 $(CPPULIB) \
+$(UNOTESTLIB)   \
+$(TESTLIB)  \
 $(SALLIB)
 
 
@@ -135,27 +137,5 @@ APP2STDLIBS=\
 
 # --- Targets --
 
-  .INCLUDE : target.mk
-  .INCLUDE : _cppunit.mk
-
-# --- Fake uno bootstrap & copy testfile 
-
-  $(BIN)$/pdfi_unittest_test.pdf : testinput.pdf
-  rm -f $@
-  $(GNUCOPY) testinput.pdf $@
-
-  $(BIN)$/pdfi_unittest_test.ini : makefile.mk
-  rm -f $@
-  @echo UNO_SERVICES= > $@
-  @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@
-
-# --- Enable testshl2 execution in normal build 
-
-  $(MISC)$/pdfi_unittest_succeeded : $(SHL1TARGETN) 
$(BIN)$/pdfi_unittest_test.pdf $(BIN)$/pdfi_unittest_test.ini
-  rm -f $(BIN)$/pdfi_unittest_draw.xml
-  rm -f $(BIN)$/pdfi_unittest_writer.xml
-  @echo --
-  @echo - start unit test on library $(SHL1TARGETN)
-  @echo --
-  testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
-   $(TOUCH) $@
+.INCLUDE : target.mk
+.INCLUDE : _cppunit.mk
diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index 145f938..cffb336 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -29,6 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sdext.hxx"
 
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
 #define BASEGFX_STATICLIBRARY
 
 #ifdef SYSTEM_ZLIB
@@ -47,12 +50,17 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include 
 
 #include 
 #include 
@@ -471,58 +479,17 @@ namespace
 bool  m_bDashedLineSeen;
 };
 
-class PDFITest : public CppUnit::TestFixture
+class PDFITest : public test::BootstrapFixture
 {
-uno::Reference mxCtx;
-rtl::OUString  msBaseDir;
-bool   mbUnoInitialized;
-
 public:
-PDFITest() : mxCtx(),msBaseDir(),mbUnoInitialized(false)
-{}
-
-void setUp()
-{
-if( !mbUnoInitialized )
-{
-const char* pArgs( getForwardString() );
-CPPUNIT_ASSERT_MESSAGE("Test file parameter", pArgs);
-
-msBaseDir = rtl::OUString::createFromAscii(pArgs);
-
-// bootstrap UNO
-try
-{
-::rtl::OUString aIniUrl;
-CPPUNIT_ASSERT_MESSAGE(
-"Converting ini file to URL",
-osl_getFileURLFromSystemPath(
-
(msBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.ini"))).pData,
-&aIniUrl.pData ) == osl_File_E_None );
-
-mxCtx = 
::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
-CPPUNIT_ASSERT_MESSAGE("Getting component context", 
mxCtx.is());
-}
-catch( uno::Exception& )
-{
-CPPUNIT_ASSERT_MESSAGE("Bootstrapping UNO", false);
-}
-
-mbUnoInitialized = true;
-}
-}
-void tearDown()
-{
-}
-
 void testXPDFParser()
 {
 pdfi::ContentSinkSharedPtr pSink( new TestSink() );
-pdfi::xpdf_ImportFromFile( msBaseDir + 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")),
+pdfi::xpdf_ImportFromFil

[Libreoffice-commits] .: sdext/source

2011-11-22 Thread Andras Timar

 dev/null   
 |binary
 sdext/source/minimizer/makefile.mk 
 |   11 --
 sdext/source/minimizer/optimizerdialog.cxx 
 |   48 --
 sdext/source/minimizer/optimizerdialogcontrols.cxx 
 |1 
 sdext/source/minimizer/pppoptimizertoken.cxx   
 |3 
 sdext/source/minimizer/pppoptimizertoken.hxx   
 |3 
 
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
   |7 -
 
sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs
 |5 -
 8 files changed, 1 insertion(+), 77 deletions(-)

New commits:
commit eb339bf18c1e76b208d3bfb21120717a97e23d45
Author: Andras Timar 
Date:   Tue Nov 22 19:15:03 2011 +0100

remove (empty) help of Presentation Minimizer fdo#39306

diff --git a/sdext/source/minimizer/help/help_de.odt 
b/sdext/source/minimizer/help/help_de.odt
deleted file mode 100644
index bb9bc03..000
Binary files a/sdext/source/minimizer/help/help_de.odt and /dev/null differ
diff --git a/sdext/source/minimizer/help/help_en-US.odt 
b/sdext/source/minimizer/help/help_en-US.odt
deleted file mode 100644
index bb9bc03..000
Binary files a/sdext/source/minimizer/help/help_en-US.odt and /dev/null differ
diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index 7932e59..f28b41e 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -100,18 +100,13 @@ COMPONENT_BITMAPS= \
 COMPONENT_IMAGES=\
 $(EXTENSIONDIR)$/bitmaps$/extension_32.png
 
-# rather freestyle or common to all?
-COMPONENT_HELP= \
-$(EXTENSIONDIR)$/help$/help_de.odt \
-$(EXTENSIONDIR)$/help$/help_en-US.odt
-
 DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
 
 COMPONENT_DESCRIPTION= \
 $(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) 
$(COMPONENT_DESCRIPTION)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) 
$(COMPONENT_DESCRIPTION)
 
 ZIP2TARGET= presentation_minimizer_develop
 .IF "$(WITH_LANG)"!=""
@@ -143,10 +138,6 @@ $(COMPONENT_IMAGES) : 
$(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
-$(COMPONENT_HELP) : help$/$$(@:f)
-@@-$(MKDIRHIER) $(@:d)
-$(COPY) $< $@
-
 $(DESCRIPTION_SRC) : description.xml
 @@-$(MKDIRHIER) $(@:d)
 .IF "$(WITH_LANG)" != ""
diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext/source/minimizer/optimizerdialog.cxx
index 3d60123..650b4e2 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -513,52 +513,6 @@ void ActionListener::actionPerformed( const ActionEvent& 
rEvent )
 {
 switch( TKGet( rEvent.ActionCommand ) )
 {
-case TK_btnNavHelp :
-{
-try
-{
-static Reference< XFrame > xHelpFrame;
-if ( !xHelpFrame.is() )
-{
-rtl::OUString sHelpFile( mrOptimizerDialog.getPath( 
TK_HelpFile ) );
-Reference< XDesktop > desktop( 
mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), 
mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
-Reference< XSimpleFileAccess > xSimpleFileAccess( 
mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), 
mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
-Reference< XInputStream > xInputStream( 
xSimpleFileAccess->openFileRead( sHelpFile ) );
-Reference< XDesktop > xDesktop( 
mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), 
mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
-Reference< XFrame > xDesktopFrame( xDesktop, 
UNO_QUERY_THROW );
-xHelpFrame = Reference< XFrame >( 
xDesktopFrame->findFrame( TKGet( TK__blank ), 0 ) );
-Reference< XCloseBroadcaster > xCloseBroadcaster( 
xHelpFrame, UNO_QUERY_THROW );
-xCloseBroadcaster->addCloseListener( new 
HelpCloseListener( xHelpFrame ) );
-Reference< XComponentLoader > xLoader( xHelpFrame,

[Libreoffice-commits] .: sdext/source

2011-10-31 Thread Andras Timar

 sdext/source/minimizer/description-en-US.txt  |2 +
 sdext/source/minimizer/description.xml|2 -
 sdext/source/minimizer/help/component.txt |2 -
 sdext/source/minimizer/makefile.mk|   24 --
 sdext/source/pdfimport/config/component.txt   |1 
 sdext/source/pdfimport/config/description.xml |   33 --
 sdext/source/pdfimport/description-en-US.txt  |1 
 sdext/source/pdfimport/description.xml|   33 ++
 sdext/source/pdfimport/makefile.mk|   24 +-
 sdext/source/presenter/description-en-US.txt  |2 +
 sdext/source/presenter/description.xml|2 -
 sdext/source/presenter/help/component.txt |2 -
 sdext/source/presenter/makefile.mk|   20 ++-
 13 files changed, 91 insertions(+), 57 deletions(-)

New commits:
commit 3c3f1e3959ccfbd6427ae6610daa4c961559ba69
Author: Andras Timar 
Date:   Mon Oct 31 13:23:36 2011 +0100

enable localization of extension descriptions in sdext

diff --git a/sdext/source/minimizer/description-en-US.txt 
b/sdext/source/minimizer/description-en-US.txt
new file mode 100644
index 000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/description-en-US.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/description.xml 
b/sdext/source/minimizer/description.xml
index f8762c7..eef22a7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,7 +28,7 @@
 
 
 
-  
+  
 
 
 
diff --git a/sdext/source/minimizer/help/component.txt 
b/sdext/source/minimizer/help/component.txt
deleted file mode 100755
index 98f2687..000
--- a/sdext/source/minimizer/help/component.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
-The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index fcca6aa..7932e59 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,11 +103,15 @@ COMPONENT_IMAGES=\
 # rather freestyle or common to all?
 COMPONENT_HELP= \
 $(EXTENSIONDIR)$/help$/help_de.odt \
-$(EXTENSIONDIR)$/help$/help_en-US.odt \
-$(EXTENSIONDIR)$/help$/component.txt
+$(EXTENSIONDIR)$/help$/help_en-US.odt
+
+DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
+
+COMPONENT_DESCRIPTION= \
+$(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) 
$(COMPONENT_DESCRIPTION)
 
 ZIP2TARGET= presentation_minimizer_develop
 .IF "$(WITH_LANG)"!=""
@@ -143,4 +147,18 @@ $(COMPONENT_HELP) : help$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
+$(DESCRIPTION_SRC) : description.xml
+@@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)" != ""
+$(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
+.ELSE
+$(COPY) $< $@
+.ENDIF
+
+$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COPY) description-en-US.txt $(EXTENSIONDIR)
+.IF "$(WITH_LANG)" != ""
+$(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+.ENDIF
+
 .ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/config/component.txt 
b/sdext/source/pdfimport/config/component.txt
deleted file mode 100644
index 969581e..000
--- a/sdext/source/pdfimport/config/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The PDF Import Extension allows you to import and modify PDF documents. Best 
results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid 
file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF 
file that contains an embedded ODF source file. Hybrid PDF/ODF files will be 
opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml 
b/sdext/source/pdfimport/config/description.xml
deleted file mode 100644
index ac0d502..000
--- a/sdext/source/pdfimport/config/description.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-http://openoffice.org/extensions/description/2006";
-xmlns:xlink="http://www.w3.org/1999/xlink";
-xmlns:dep="http://openoffice.org/extensions/de

[Libreoffice-commits] .: sdext/source

2011-10-30 Thread Andras Timar

 sdext/source/minimizer/description-en-US.txt  |2 -
 sdext/source/minimizer/description.xml|2 -
 sdext/source/minimizer/help/component.txt |2 +
 sdext/source/minimizer/makefile.mk|   18 ++
 sdext/source/pdfimport/config/component.txt   |1 
 sdext/source/pdfimport/config/description.xml |   33 ++
 sdext/source/pdfimport/description-en-US.txt  |1 
 sdext/source/pdfimport/description.xml|   33 --
 sdext/source/pdfimport/makefile.mk|   18 +-
 sdext/source/presenter/description-en-US.txt  |2 -
 sdext/source/presenter/description.xml|2 -
 sdext/source/presenter/help/component.txt |2 +
 sdext/source/presenter/makefile.mk|   16 +---
 13 files changed, 57 insertions(+), 75 deletions(-)

New commits:
commit a18bfb0830796fbbb2f2699e9213d29045a7ef19
Author: Andras Timar 
Date:   Sun Oct 30 22:56:43 2011 +0100

Revert "enable localization of extension descriptions in sdext"

This reverts commit 184653370717f99e0cce817822caecde01d20006.

diff --git a/sdext/source/minimizer/description-en-US.txt 
b/sdext/source/minimizer/description-en-US.txt
deleted file mode 100644
index 98f2687..000
--- a/sdext/source/minimizer/description-en-US.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
-The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/description.xml 
b/sdext/source/minimizer/description.xml
index eef22a7..f8762c7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,7 +28,7 @@
 
 
 
-  
+  
 
 
 
diff --git a/sdext/source/minimizer/help/component.txt 
b/sdext/source/minimizer/help/component.txt
new file mode 100755
index 000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/help/component.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index 0913921..fcca6aa 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,15 +103,11 @@ COMPONENT_IMAGES=\
 # rather freestyle or common to all?
 COMPONENT_HELP= \
 $(EXTENSIONDIR)$/help$/help_de.odt \
-$(EXTENSIONDIR)$/help$/help_en-US.odt
-
-DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
-
-COMPONENT_DESCRIPTION= \
-$(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
+$(EXTENSIONDIR)$/help$/help_en-US.odt \
+$(EXTENSIONDIR)$/help$/component.txt
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) 
$(COMPONENT_DESCRIPTION)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
 
 ZIP2TARGET= presentation_minimizer_develop
 .IF "$(WITH_LANG)"!=""
@@ -147,12 +143,4 @@ $(COMPONENT_HELP) : help$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
-$(DESCRIPTION_SRC) : description.xml
-@@-$(MKDIRHIER) $(@:d)
-$(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
-
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
-$(COPY) description-en-US.txt $(EXTENSIONDIR)
-$(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
-
 .ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/config/component.txt 
b/sdext/source/pdfimport/config/component.txt
new file mode 100644
index 000..969581e
--- /dev/null
+++ b/sdext/source/pdfimport/config/component.txt
@@ -0,0 +1 @@
+The PDF Import Extension allows you to import and modify PDF documents. Best 
results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid 
file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF 
file that contains an embedded ODF source file. Hybrid PDF/ODF files will be 
opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml 
b/sdext/source/pdfimport/config/description.xml
new file mode 100644
index 000..ac0d502
--- /dev/null
+++ b/sdext/source/pdfimport/config/description.xml
@@ -0,0 +1,33 @@
+
+http://openoffice.org/extensions/description/2006";
+xmlns:xlink="http://www.w3.org/1999/xlink";
+xmlns:dep="http://openoffice.org/extensions/description/2006";>
+
+
+
+

[Libreoffice-commits] .: sdext/source

2011-10-30 Thread Andras Timar

 sdext/source/minimizer/description-en-US.txt  |2 +
 sdext/source/minimizer/description.xml|2 -
 sdext/source/minimizer/help/component.txt |2 -
 sdext/source/minimizer/makefile.mk|   18 +++---
 sdext/source/pdfimport/config/component.txt   |1 
 sdext/source/pdfimport/config/description.xml |   33 --
 sdext/source/pdfimport/description-en-US.txt  |1 
 sdext/source/pdfimport/description.xml|   33 ++
 sdext/source/pdfimport/makefile.mk|   18 --
 sdext/source/presenter/description-en-US.txt  |2 +
 sdext/source/presenter/description.xml|2 -
 sdext/source/presenter/help/component.txt |2 -
 sdext/source/presenter/makefile.mk|   16 +++-
 13 files changed, 75 insertions(+), 57 deletions(-)

New commits:
commit 184653370717f99e0cce817822caecde01d20006
Author: Andras Timar 
Date:   Sun Oct 30 21:47:13 2011 +0100

enable localization of extension descriptions in sdext

diff --git a/sdext/source/minimizer/description-en-US.txt 
b/sdext/source/minimizer/description-en-US.txt
new file mode 100644
index 000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/description-en-US.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/description.xml 
b/sdext/source/minimizer/description.xml
index f8762c7..eef22a7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,7 +28,7 @@
 
 
 
-  
+  
 
 
 
diff --git a/sdext/source/minimizer/help/component.txt 
b/sdext/source/minimizer/help/component.txt
deleted file mode 100755
index 98f2687..000
--- a/sdext/source/minimizer/help/component.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
-The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index fcca6aa..0913921 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,11 +103,15 @@ COMPONENT_IMAGES=\
 # rather freestyle or common to all?
 COMPONENT_HELP= \
 $(EXTENSIONDIR)$/help$/help_de.odt \
-$(EXTENSIONDIR)$/help$/help_en-US.odt \
-$(EXTENSIONDIR)$/help$/component.txt
+$(EXTENSIONDIR)$/help$/help_en-US.odt
+
+DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
+
+COMPONENT_DESCRIPTION= \
+$(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) 
$(COMPONENT_DESCRIPTION)
 
 ZIP2TARGET= presentation_minimizer_develop
 .IF "$(WITH_LANG)"!=""
@@ -143,4 +147,12 @@ $(COMPONENT_HELP) : help$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
+$(DESCRIPTION_SRC) : description.xml
+@@-$(MKDIRHIER) $(@:d)
+$(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
+
+$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COPY) description-en-US.txt $(EXTENSIONDIR)
+$(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+
 .ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/config/component.txt 
b/sdext/source/pdfimport/config/component.txt
deleted file mode 100644
index 969581e..000
--- a/sdext/source/pdfimport/config/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The PDF Import Extension allows you to import and modify PDF documents. Best 
results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid 
file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF 
file that contains an embedded ODF source file. Hybrid PDF/ODF files will be 
opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml 
b/sdext/source/pdfimport/config/description.xml
deleted file mode 100644
index ac0d502..000
--- a/sdext/source/pdfimport/config/description.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-http://openoffice.org/extensions/description/2006";
-xmlns:xlink="http://www.w3.org/1999/xlink";
-xmlns:dep="http://openoffice.org/extensions/description/2006";>
-
-
-
-
-
-
-
-
-
-
-
-http://www.documentfound

[Libreoffice-commits] .: sdext/source unusedcode.easy

2011-10-25 Thread Jan Holesovsky

 sdext/source/presenter/PresenterAccessibility.cxx   |8 
 sdext/source/presenter/PresenterAccessibility.hxx   |5 
 sdext/source/presenter/PresenterAnimation.cxx   |   10 -
 sdext/source/presenter/PresenterAnimation.hxx   |5 
 sdext/source/presenter/PresenterConfigurationAccess.cxx |   56 -
 sdext/source/presenter/PresenterConfigurationAccess.hxx |   20 --
 sdext/source/presenter/PresenterController.cxx  |   26 --
 sdext/source/presenter/PresenterController.hxx  |2 
 sdext/source/presenter/PresenterFrameworkObserver.cxx   |   15 -
 sdext/source/presenter/PresenterFrameworkObserver.hxx   |   15 -
 sdext/source/presenter/PresenterPaneAnimator.cxx|   48 -
 sdext/source/presenter/PresenterPaneAnimator.hxx|   21 --
 sdext/source/presenter/PresenterPaneBase.cxx|   13 -
 sdext/source/presenter/PresenterPaneBase.hxx|2 
 sdext/source/presenter/PresenterPaneBorderPainter.cxx   |8 
 sdext/source/presenter/PresenterPaneBorderPainter.hxx   |2 
 sdext/source/presenter/PresenterScrollBar.cxx   |8 
 sdext/source/presenter/PresenterScrollBar.hxx   |2 
 sdext/source/presenter/PresenterSprite.cxx  |   32 ---
 sdext/source/presenter/PresenterSprite.hxx  |4 
 sdext/source/presenter/PresenterTextView.cxx|   35 ---
 sdext/source/presenter/PresenterTextView.hxx|4 
 sdext/source/presenter/PresenterTheme.cxx   |   18 -
 sdext/source/presenter/PresenterTheme.hxx   |4 
 sdext/source/presenter/PresenterTimer.cxx   |   18 -
 sdext/source/presenter/PresenterTimer.hxx   |5 
 sdext/source/presenter/PresenterToolBar.cxx |   90 -
 sdext/source/presenter/PresenterToolBar.hxx |7 
 sdext/source/presenter/PresenterWindowManager.cxx   |  152 
 sdext/source/presenter/PresenterWindowManager.hxx   |1 
 unusedcode.easy |   32 ---
 31 files changed, 668 deletions(-)

New commits:
commit a38cbc58bbe3b385830a5287ea272e28a8ae3652
Author: Felix Zhang 
Date:   Mon Oct 24 17:50:01 2011 +0800

remove unused methods from sdext:presenter

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx 
b/sdext/source/presenter/PresenterAccessibility.cxx
index 35c17c0..a614fbc 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -789,14 +789,6 @@ void PresenterAccessible::NotifyCurrentSlideChange (
 
 
 
-bool PresenterAccessible::IsAccessibilityActive (void) const
-{
-return mpAccessibleConsole.is();
-}
-
-
-
-
 void SAL_CALL PresenterAccessible::disposing (void)
 {
 UpdateAccessibilityHierarchy(
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx 
b/sdext/source/presenter/PresenterAccessibility.hxx
index 16e19ab..9868db5 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -85,11 +85,6 @@ public:
 const sal_Int32 nCurrentSlideIndex,
 const sal_Int32 nSlideCount);
 
-/** Return whether accessibility support is active, i.e. whether
-somebody has called getAccessibleContext() yet.
-*/
-bool IsAccessibilityActive (void) const;
-
 virtual void SAL_CALL disposing (void);
 
 
diff --git a/sdext/source/presenter/PresenterAnimation.cxx 
b/sdext/source/presenter/PresenterAnimation.cxx
index 0be27e8..40b321b 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -93,16 +93,6 @@ sal_uInt64 PresenterAnimation::GetStepDuration (void)
 
 
 
-void PresenterAnimation::AddStartCallback (const Callback& rCallback)
-{
-if (mpStartCallbacks.get() == NULL)
-mpStartCallbacks.reset(new ::std::vector());
-mpStartCallbacks->push_back(rCallback);
-}
-
-
-
-
 void PresenterAnimation::AddEndCallback (const Callback& rCallback)
 {
 if (mpEndCallbacks.get() == NULL)
diff --git a/sdext/source/presenter/PresenterAnimation.hxx 
b/sdext/source/presenter/PresenterAnimation.hxx
index 76d102a..20819b5 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -83,11 +83,6 @@ public:
 
 typedef ::boost::function Callback;
 
-/** Add a callback that is executed before Run() is called for the first
-time.
-*/
-void AddStartCallback (const Callback& rCallback);
-
 /** Add a callback that is executed after Run() is called for the last
 time.
 */
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx 
b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index acba65b..c47e3a5 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -128,17 +128,6 @@ Any PresenterConfigurationAccess::GetConfig

[Libreoffice-commits] .: sdext/source

2011-10-20 Thread Andras Timar

 sdext/source/presenter/description.txt|2 --
 sdext/source/presenter/description.xml|2 +-
 sdext/source/presenter/help/component.txt |2 ++
 sdext/source/presenter/makefile.mk|   18 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit bce48fb94b1ff2f87fac7185ff5a9904bcf83484
Author: Andras Timar 
Date:   Thu Oct 20 15:07:50 2011 +0200

Revert "localize description.xml of presenter-screen extension"

This reverts commit 89f7e17692d019a68d251d39bcc592a4ee8ba0dc.

diff --git a/sdext/source/presenter/description.txt 
b/sdext/source/presenter/description.txt
deleted file mode 100644
index 26a10c6..000
--- a/sdext/source/presenter/description.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presenter Console Extension provides more control over your slide show 
presentation, such as the ability to see the upcoming slide, the slide notes, 
and a presentation timer whereas the audience see only the current slide.
-To avoid confusions by displaying a large number of presentation elements, the 
Presenter Console displays the elements on three different easily changeable 
views.
diff --git a/sdext/source/presenter/description.xml 
b/sdext/source/presenter/description.xml
index 14a8a18..bf9ce72 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,7 +28,7 @@
   
 
   
-
+
   
 
 
diff --git a/sdext/source/presenter/help/component.txt 
b/sdext/source/presenter/help/component.txt
new file mode 100755
index 000..26a10c6
--- /dev/null
+++ b/sdext/source/presenter/help/component.txt
@@ -0,0 +1,2 @@
+The Presenter Console Extension provides more control over your slide show 
presentation, such as the ability to see the upcoming slide, the slide notes, 
and a presentation timer whereas the audience see only the current slide.
+To avoid confusions by displaying a large number of presentation elements, the 
Presenter Console displays the elements on three different easily changeable 
views.
diff --git a/sdext/source/presenter/makefile.mk 
b/sdext/source/presenter/makefile.mk
index df6c633..1afbb1e 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -247,12 +247,9 @@ COMPONENT_LIBRARY= 
\
 PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
 
 COMPONENT_HELP=
\
+$(ZIP1DIR)$/help/component.txt \
 $(foreach,l,$(alllangiso) 
$(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
 
-COMPONENT_DESCRIPTION= 
 \
-$(foreach,l,$(alllangiso:s/en-US//) $(ZIP1DIR)$/$l-description.txt) \
-$(ZIP1DIR)$/description.txt
-
 ZIP1DEPS=  \
 $(DESCRIPTION) \
 $(COMPONENT_MANIFEST)  \
@@ -260,8 +257,7 @@ ZIP1DEPS=   \
 $(COMPONENT_BITMAPS)   \
 $(COMPONENT_IMAGES)\
 $(COMPONENT_LIBRARY)   \
-$(COMPONENT_HELP)   \
-$(COMPONENT_DESCRIPTION)
+$(COMPONENT_HELP)
 
 LINKNAME:=help
 XHPLINKSRC:=$(ZIP1DIR)/help
@@ -288,6 +284,10 @@ $(COMPONENT_MANIFEST) : $$(@:f)
 @-$(MKDIRHIER) $(@:d)
 +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
 
+$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
+@@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
+
 $(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : 
$(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
 @echo creating $@
 @-$(MKDIRHIER) $(@:d)
@@ -368,11 +368,7 @@ PHONYDESC=.PHONY
 $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
 @-$(MKDIRHIER) $(@:d)
 @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
-$(GNUCOPY) description.txt $(ZIP1DIR)/description.txt
-$(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
-$(TYPE) $@ | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@.new
-mv $@.new $@
-
+$(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
 
 ALLTAR: $(MISC)/../bin/presenter-screen.oxt
 # hotfix to missing localizations
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source svx/inc svx/source unusedcode.easy

2011-10-15 Thread Julien Nabet

 sdext/source/presenter/PresenterWindowManager.cxx |  117 --
 sdext/source/presenter/PresenterWindowManager.hxx |   10 -
 svx/inc/svx/sdr/contact/viewcontactofe3d.hxx  |3 
 svx/source/sdr/contact/viewcontactofe3d.cxx   |   14 --
 unusedcode.easy   |6 -
 5 files changed, 150 deletions(-)

New commits:
commit 9895d3169fb1a20b8e7fb0215acff71beabecdaa
Author: Julien Nabet 
Date:   Sun Oct 16 01:06:33 2011 +0200

Some callcatcher cleaning

diff --git a/sdext/source/presenter/PresenterWindowManager.cxx 
b/sdext/source/presenter/PresenterWindowManager.cxx
index 466e3fe..1414e6e 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -242,45 +242,6 @@ void PresenterWindowManager::SetTheme (const 
::boost::shared_ptr
 }
 }
 
-
-
-
-void PresenterWindowManager::NotifyPaneCreation (
-const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor)
-{
-if (rpDescriptor.get()==NULL)
-{
-OSL_ASSERT(rpDescriptor.get()!=NULL);
-return;
-}
-if ( ! rpDescriptor->mxContentWindow.is())
-{
-OSL_ASSERT(rpDescriptor->mxContentWindow.is());
-return;
-}
-
-mbIsLayoutPending = true;
-
-Reference xBorderWindow (rpDescriptor->mxBorderWindow);
-OSL_ASSERT(xBorderWindow.is());
-if (xBorderWindow.is() && ! rpDescriptor->mbIsSprite)
-{
-Invalidate();
-
-xBorderWindow->addWindowListener(this);
-xBorderWindow->addFocusListener(this);
-#ifndef ENABLE_PANE_RESIZING
-xBorderWindow->addMouseListener(this);
-#endif
-}
-
-UpdateWindowList();
-Layout();
-}
-
-
-
-
 void PresenterWindowManager::NotifyViewCreation (const Reference& 
rxView)
 {
 PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
@@ -297,32 +258,6 @@ void PresenterWindowManager::NotifyViewCreation (const 
Reference& rxView)
 }
 }
 
-
-
-
-void PresenterWindowManager::SetPanePosSizeRelative (
-const Reference& rxPaneId,
-const double nRelativeX,
-const double nRelativeY,
-const double nRelativeWidth,
-const double nRelativeHeight)
-{
-PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
-mpPaneContainer->FindPaneId(rxPaneId));
-if (pDescriptor.get() != NULL)
-{
-pDescriptor->mnLeft = nRelativeX;
-pDescriptor->mnTop = nRelativeY;
-pDescriptor->mnRight = nRelativeX + nRelativeWidth;
-pDescriptor->mnBottom = nRelativeY + nRelativeHeight;
-
-mpPaneContainer->ToTop(pDescriptor);
-}
-}
-
-
-
-
 void PresenterWindowManager::SetPanePosSizeAbsolute (
 const OUString& rsPaneURL,
 const double nX,
@@ -661,17 +596,6 @@ void PresenterWindowManager::SetSlideSorterState (bool 
bIsActive)
 }
 }
 
-
-
-
-bool PresenterWindowManager::IsSlideSorterActive (void) const
-{
-return mbIsSlideSorterActive;
-}
-
-
-
-
 void PresenterWindowManager::SetHelpViewState (bool bIsActive)
 {
 if (mbIsHelpViewActive != bIsActive)
@@ -690,17 +614,6 @@ void PresenterWindowManager::SetHelpViewState (bool 
bIsActive)
 }
 }
 
-
-
-
-bool PresenterWindowManager::IsHelpViewActive (void) const
-{
-return mbIsHelpViewActive;
-}
-
-
-
-
 void PresenterWindowManager::SetViewMode (const ViewMode eMode)
 {
 switch (eMode)
@@ -1186,36 +1099,6 @@ void PresenterWindowManager::NotifyDisposing (void)
 }
 }
 
-
-
-
-void PresenterWindowManager::LayoutUnknownMode (void)
-{
-awt::Rectangle aBox = mxParentWindow->getPosSize();
-
-PresenterPaneContainer::PaneList::const_iterator iPane;
-PresenterPaneContainer::PaneList::const_iterator iEnd 
(mpPaneContainer->maPanes.end());
-for (iPane=mpPaneContainer->maPanes.begin(); iPane!=iEnd; ++iPane)
-{
-const PresenterPaneContainer::SharedPaneDescriptor& pDescriptor 
(*iPane);
-if ( ! pDescriptor->mxBorderWindow.is())
-continue;
-
-// Layout the border window.
-const sal_Int32 nX = (sal_Int32)(pDescriptor->mnLeft * aBox.Width);
-const sal_Int32 nY = (sal_Int32)(pDescriptor->mnTop * aBox.Height);
-const sal_Int32 nWidth = (sal_Int32)(pDescriptor->mnRight * 
aBox.Width) - nX;
-const sal_Int32 nHeight = (sal_Int32)(pDescriptor->mnBottom * 
aBox.Height) - nY;
-
-pDescriptor->mxBorderWindow->setPosSize(
-nX,nY,nWidth,nHeight,
-awt::PosSize::POSSIZE);
-}
-}
-
-
-
-
 void PresenterWindowManager::UpdateWindowSize (const Reference& 
rxBorderWindow)
 {
 PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx 
b/sdext/source/presenter/PresenterWindowManager.hxx
index 997565b..d4e919d 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -90,14 +90,7 @@ public:
 
 void SetParentPane (const 
css::uno::Reference& rxPane);
 void SetTheme (const ::bo

[Libreoffice-commits] .: sdext/source solenv/inc

2011-10-05 Thread Andras Timar

 sdext/source/minimizer/makefile.mk 
   |2 -
 
sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
 |   14 +-
 solenv/inc/extension_post.mk   
   |4 --
 3 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit dbf650a31da1ded5bd50e66a39fcf63ade943697
Author: Andras Timar 
Date:   Wed Oct 5 22:11:46 2011 +0200

eliminate @MINIMIZEREXTENSIONPRODUCTNAME@ variable

diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index 164f106..fcca6aa 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -79,8 +79,6 @@ SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
 SHL1RPATH=  OXT
 DEF1NAME=  $(SHL1TARGET)
 
-COMPONENT_XCU_REPLACEMENT=s/@MINIMIZEREXTENSIONPRODUCTNAME@/Presentation 
Minimizer/g
-
 COMPONENT_MERGED_XCU= \
 $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
 
$(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \
diff --git 
a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
 
b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
index 0832495..ccb4759 100644
--- 
a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ 
b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
@@ -11,7 +11,7 @@
 
 
 
-@MINIMIZEREXTENSIONPRODUCTNAME@
+Presentation Minimizer
 
 
 Steps
@@ -35,12 +35,12 @@
 Introduction
 
 
-The @MINIMIZEREXTENSIONPRODUCTNAME@ is 
used to reduce the file size of the current presentation. Images will be 
compressed and data, that is no longer needed, will be removed.
+The Presentation Minimizer is used to 
reduce the file size of the current presentation. Images will be compressed and 
data, that is no longer needed, will be removed.
 
 At the last step of the wizard you can choose to apply the changes to 
the current presentation or to create an optimized new version of the 
presentation.
 
 
-~Choose settings for 
@MINIMIZEREXTENSIONPRODUCTNAME@
+~Choose settings for Presentation 
Minimizer
 
 
 ~Delete
@@ -185,16 +185,16 @@ The current presentation contains no OLE objects.
 OK
 
 
-The @MINIMIZEREXTENSIONPRODUCTNAME@ has 
successfully updated the presentation '%TITLE'. The file size has changed from 
%OLDFILESIZE MB to %NEWFILESIZE MB.
+The Presentation Minimizer has 
successfully updated the presentation '%TITLE'. The file size has changed from 
%OLDFILESIZE MB to %NEWFILESIZE MB.
 
 
-The @MINIMIZEREXTENSIONPRODUCTNAME@ has 
successfully updated the presentation '%TITLE'. The file size has changed from 
%OLDFILESIZE MB to approximated %NEWFILESIZE MB.
+The Presentation Minimizer has 
successfully updated the presentation '%TITLE'. The file size has changed from 
%OLDFILESIZE MB to approximated %NEWFILESIZE MB.
 
 
-The @MINIMIZEREXTENSIONPRODUCTNAME@ has 
successfully updated the presentation '%TITLE'. The file size has changed to 
%NEWFILESIZE MB.
+The Presentation Minimizer has 
successfully updated the presentation '%TITLE'. The file size has changed to 
%NEWFILESIZE MB.
 
 
-The @MINIMIZEREXTENSIONPRODUCTNAME@ has 
successfully updated the presentation '%TITLE'. The file size has changed to 
approximated %NEWFILESIZE MB.
+The Presentation Minimizer has 
successfully updated the presentation '%TITLE'. The file size has changed to 
approximated %NEWFILESIZE MB.
 
 
 Duplicating presentation...
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index ca65e5a..cff8f09 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -39,11 +39,7 @@ fixme4=$(fixme:n)
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
 @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
-.IF "$(COMPONENT_XCU_REPLACEMENT)"!=""
-$(TYPE) $< | sed '$(COMPONENT_XCU_REPLACEMENT)' > 
$(subst,$(fixme2),$(MISC) $@)
-.ELSE  # "$(COMPONENT_REPLACEMENT)"!=""
 $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
-.ENDIF  # "$(COMPONENT_REPLACEMENT)"!=""
 
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
 @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://li

[Libreoffice-commits] .: sdext/source

2011-10-03 Thread Andras Timar

 sdext/source/pdfimport/config/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0daa1c539ccfd876621294907e09b775338a7b44
Author: Andras Timar 
Date:   Mon Oct 3 13:14:56 2011 +0200

fix smoketest-breaking typo again

diff --git a/sdext/source/pdfimport/config/description.xml 
b/sdext/source/pdfimport/config/description.xml
index 53f000b..ac0d502 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -28,6 +28,6 @@
 
 
   
-
+
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-09-21 Thread Lubos Lunak

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8861df394604fa6dd8c72181a023557d037f7235
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Sep 21 17:13:25 2011 +0200

build without glib poppler bindings

- there's not configure check for it, only for poppler itself
- and it's not actually used anyway

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 2a35fb7..f24dd9f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -68,7 +68,11 @@ class PDFDoc;
 #define POPPLER_CHECK_VERSION(major,minor,micro) (0)
 typedef GString GooString;
 #else
-#include 
+#include 
+#define POPPLER_CHECK_VERSION(major,minor,micro) \
+  (POPPLER_VERSION_MAJOR > (major) || \
+   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
+   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && 
POPPLER_VERSION_MICRO >= (micro)))
 #endif
 
 namespace pdfi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-09-16 Thread Tomáš Chvátal

 sdext/source/presenter/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0022716105b9935ae16d3817191c546d3f8e0da
Author: Tomas Chvatal 
Date:   Sat Sep 17 05:44:43 2011 +0200

Fix install for presenter extension.

diff --git a/sdext/source/presenter/makefile.mk 
b/sdext/source/presenter/makefile.mk
index 1a3c052..6427c25 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -288,7 +288,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $< $@
 
-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : 
$(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
+$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : 
$(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
 @echo creating $@
 @-$(MKDIRHIER) $(@:d)
 $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 
's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source unusedcode.easy

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source sfx2/qa sfx2/source shell/source soltools/adjustvisibility sot/source starmath/source

[Libreoffice-commits] .: sdext/source unusedcode.easy

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source unusedcode.easy

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source svx/inc svx/source unusedcode.easy

[Libreoffice-commits] .: sdext/source solenv/inc

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: sdext/source

30 matches

Site Navigation

Mail list logo

Footer information