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

[Libreoffice-commits] .: filter/source i18npool/inc i18npool/source shell/source svtools/source

2013-01-26 Thread Libreoffice Gerrit user

 filter/source/msfilter/countryid.cxx   |2 +-
 i18npool/inc/i18npool/lang.h   |2 +-
 i18npool/source/isolang/isolang.cxx|2 +-
 i18npool/source/isolang/mslangid.cxx   |2 +-
 shell/source/win32/shlxthandler/util/utilities.cxx |2 +-
 svtools/source/misc/langtab.src|2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 828dfdd4fb9fc133f4e3241e9722f23f3778db08
Author: Andras Timar ati...@suse.com
Date:   Sat Jan 26 11:17:10 2013 +0100

unify the spelling of 'Kazakh' language name

While 'Kazakh' can be written as 'Kazak' or 'Qazaq', the 'Kazakh' form
is the most widespread according to online sources (Wikipedia,
LCID list from Microsoft). Also the 'Kazakh' form is preferred by a
Kazakh contributor, see 
http://listarchives.libreoffice.org/global/l10n/msg05444.html
In LibreOffice both 'Kazak' and 'Kazakh' was used at different places.

Change-Id: Ief83eb05e92af16cb5b795f2bbb1e3d6f7c9659a

diff --git a/filter/source/msfilter/countryid.cxx 
b/filter/source/msfilter/countryid.cxx
index 31915d3..eac02e5 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -84,7 +84,7 @@ static const CountryEntry pTable[] =
 { COUNTRY_CANADA,   LANGUAGE_ENGLISH_CAN,   
true},
 { COUNTRY_CANADA,   LANGUAGE_FRENCH_CANADIAN,   
true},
 { COUNTRY_RUSSIA,   LANGUAGE_RUSSIAN,   
false   },
-{ COUNTRY_KAZAKHSTAN,   LANGUAGE_KAZAK, 
false   },
+{ COUNTRY_KAZAKHSTAN,   LANGUAGE_KAZAKH,
false   },
 { COUNTRY_TATARSTAN,LANGUAGE_TATAR, 
false   },
 { COUNTRY_EGYPT,LANGUAGE_ARABIC_EGYPT,  
true},
 { COUNTRY_SOUTH_AFRICA, LANGUAGE_AFRIKAANS, 
false   },
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 932f92b..dc55f3f 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -234,7 +234,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_KANURI_NIGERIA 0x0471
 #define LANGUAGE_KASHMIRI   0x0460
 #define LANGUAGE_KASHMIRI_INDIA 0x0860
-#define LANGUAGE_KAZAK  0x043F
+#define LANGUAGE_KAZAKH 0x043F
 #define LANGUAGE_KHMER  0x0453
 #define LANGUAGE_KICHE_GUATEMALA0x0486  /* AKA K'iche', West 
Central Quiche,  */
 #define LANGUAGE_KINYARWANDA_RWANDA 0x0487  /* obsoletes 
LANGUAGE_USER_KINYARWANDA 0x0621 */
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index bbe3e0f..1ae850d 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -248,7 +248,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_BENGALI_BANGLADESH,  bn, BD },
 { LANGUAGE_BENGALI, bn, IN },
 { LANGUAGE_BURMESE, my, MM },
-{ LANGUAGE_KAZAK,   kk, KZ },
+{ LANGUAGE_KAZAKH,  kk, KZ },
 { LANGUAGE_ENGLISH_INDIA,   en, IN },
 { LANGUAGE_URDU,ur,},
 { LANGUAGE_URDU_INDIA,  ur, IN },
diff --git a/i18npool/source/isolang/mslangid.cxx 
b/i18npool/source/isolang/mslangid.cxx
index 2395d35..b3319aa 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -389,7 +389,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 /*
 #define LANGUAGE_ARMENIAN   0x042B
 #define LANGUAGE_INDONESIAN 0x0421
-#define LANGUAGE_KAZAK  0x043F
+#define LANGUAGE_KAZAKH 0x043F
 #define LANGUAGE_KONKANI0x0457
 #define LANGUAGE_MACEDONIAN 0x042F
 #define LANGUAGE_TATAR  0x0444
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx 
b/shell/source/win32/shlxthandler/util/utilities.cxx
index c62ec83..6fc7800 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -519,7 +519,7 @@ LCID LocaleSetToLCID( const LocaleSet_t  Locale )
 usSubLang = SUBLANG_DEFAULT;   //default sub 
language
 }
 else if ( wsLanguage == Lkk )
-usPrimaryLang = LANG_KAZAK;   //Kazak
+usPrimaryLang = LANG_KAZAK;   //Kazakh
 else if ( wsLanguage == Lky )
 usPrimaryLang = LANG_KYRGYZ;  //Kyrgyz
 else if ( wsLanguage == Lsw )
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 316b3d6..23cb311 100644
---

[Libreoffice-commits] .: filter/source

2013-01-24 Thread Libreoffice Gerrit user

 filter/source/msfilter/escherex.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2823789bec0c029d9714aff0ed65923e23177ef9
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jan 24 23:12:38 2013 +0100

fdo#58204: PPT export: fix text rotation in shapes:

EscherPropertyContainer::CreateTextProperties: do not write
ESCHER_Prop_txflTextFlow for custom shapes.  This happens to export the
rotation properly for the WW8 bugdoc of n#404221, as well as the PPT at
fdo#58204 and both PPTs at fdo#34897, one of which (mangle.ppt) was not
handled properly on master currently.  The author disclaims having any
actual knowledge about rotation properties in MSO files.

(regression from 24dd42f316e5cb16ba726c05ba486d53e033052d)

Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index cf08b7f..d456be6 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -679,7 +679,8 @@ void EscherPropertyContainer::CreateTextProperties(
 
 // n#404221: In case of rotation we need to write the txtflTextFlow
 // attribute too.
-if (bIsTextFrame)
+// fdo#58204: not custom shapes (TODO: other cases when it doesn't work?)
+if (bIsTextFrame  !bIsCustomShape)
 {
 sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
 aAny, rXPropSet, OUString( RotateAngle ), sal_True ) ?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2013-01-21 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/eps/eps.cxx |   19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 80d77c22665b3b69b40f5f20b56923e453bc15cc
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Sat Jan 19 17:37:28 2013 -0200

Remove some unneeded variables in filter

Change-Id: Ia2963498a197a795155a42b2588f983019d89f35
Reviewed-on: https://gerrit.libreoffice.org/1773
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/filter/source/graphicfilter/eps/eps.cxx 
b/filter/source/graphicfilter/eps/eps.cxx
index 9405328..58c56f5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -298,26 +298,21 @@ sal_Bool PSWriter::WritePS( const Graphic rGraphic, 
SvStream rTargetStream, Fi
 
 if( pResMgr )
 {
-String aPreviewStr( Preview );
-String aVersionStr( Version );
-String aColorStr( ColorFormat );
-String aComprStr( CompressionMode );
 #ifdef UNX // don't put binary tiff preview ahead of postscript code by 
default on unix as ghostscript is unable to read it
-mnPreview = pFilterConfigItem-ReadInt32( aPreviewStr, 0 );
+mnPreview = pFilterConfigItem-ReadInt32( Preview, 0 );
 #else
-mnPreview = pFilterConfigItem-ReadInt32( aPreviewStr, 1 );
+mnPreview = pFilterConfigItem-ReadInt32( Preview, 1 );
 #endif
-mnLevel = pFilterConfigItem-ReadInt32( aVersionStr, 2 );
+mnLevel = pFilterConfigItem-ReadInt32( Version, 2 );
 if ( mnLevel != 1 )
 mnLevel = 2;
-mbGrayScale = pFilterConfigItem-ReadInt32( aColorStr, 1 ) == 2;
+mbGrayScale = pFilterConfigItem-ReadInt32( ColorFormat, 1 ) == 
2;
 #ifdef UNX // don't compress by default on unix as ghostscript is unable to 
read LZW compressed eps
-mbCompression = pFilterConfigItem-ReadInt32( aComprStr, 0 ) != 0;
+mbCompression = pFilterConfigItem-ReadInt32( CompressionMode, 0 
) != 0;
 #else
-mbCompression = pFilterConfigItem-ReadInt32( aComprStr, 1 ) == 1;
+mbCompression = pFilterConfigItem-ReadInt32( CompressionMode, 1 
) == 1;
 #endif
-String sTextMode( TextMode );
-mnTextMode = pFilterConfigItem-ReadInt32( sTextMode, 0 );
+mnTextMode = pFilterConfigItem-ReadInt32( TextMode, 0 );
 if ( mnTextMode  2 )
 mnTextMode = 0;
 delete pResMgr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source rsc/source sc/source sd/source svl/source svx/source sw/inc sw/source

2013-01-09 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/ieps/ieps.cxx   |3 
 rsc/source/tools/rsctools.cxx   |2 
 sc/source/ui/vba/vbahelper.cxx  |   78 
 sc/source/ui/vba/vbaname.cxx|   90 +---
 sc/source/ui/vba/vbanames.cxx   |   26 +++-
 sd/source/filter/html/pubdlg.cxx|2 
 sd/source/ui/dlg/brkdlg.cxx |   18 ++---
 sd/source/ui/dlg/copydlg.cxx|   16 ++--
 sd/source/ui/dlg/custsdlg.cxx   |   32 -
 sd/source/ui/dlg/prltempl.cxx   |   16 ++--
 sd/source/ui/dlg/tpaction.cxx   |2 
 sd/source/ui/dlg/tpoption.cxx   |4 -
 sd/source/ui/func/fulinend.cxx  |2 
 sd/source/ui/func/fuprobjs.cxx  |2 
 sd/source/ui/func/fusldlg.cxx   |2 
 svl/source/items/ptitem.cxx |4 -
 svl/source/items/rectitem.cxx   |8 +-
 svl/source/items/szitem.cxx |4 -
 svx/source/dialog/compressgraphicdialog.cxx |   16 ++--
 svx/source/items/rotmodit.cxx   |2 
 svx/source/svdraw/svdattr.cxx   |   22 +++---
 svx/source/svdraw/svdview.cxx   |8 +-
 svx/source/xoutdev/xattr2.cxx   |6 -
 sw/inc/swtypes.hxx  |4 -
 sw/source/core/bastyp/swtypes.cxx   |4 -
 sw/source/ui/uno/unoatxt.cxx|6 -
 sw/source/ui/utlui/attrdesc.cxx |   10 +--
 27 files changed, 188 insertions(+), 201 deletions(-)

New commits:
commit a2296128ccc1c678f0a8a591c36b5546683f482d
Author: Jean-NoÃ«l Rouvignac jn.rouvig...@gmail.com
Date:   Wed Jan 9 10:53:05 2013 +0100

Some removal/replacement of the String/UniString with OUString

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index ee146db..931f5b7 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -20,7 +20,6 @@
 
 #include stdio.h
 
-//
 #include tools/solar.h
 #include vcl/svapp.hxx
 #include vcl/bitmap.hxx
@@ -480,7 +479,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 if ( nCount  ( (sal_uInt32)nNumber  10 ) )
 {
 aString.AppendAscii(  LanguageLevel: );
-aString.Append( UniString::CreateFromInt32( nNumber ) );
+aString.Append( OUString::valueOf( nNumber ) );
 }
 }
 aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 63d787e..857f663 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -177,7 +177,7 @@ rtl::OString OutputFile(const rtl::OString rInput, const 
char * pExt)
 rtl::OUString aUniInput(rtl::OStringToOUString(rInput, 
RTL_TEXTENCODING_ASCII_US));
 DirEntry aFileName(aUniInput);
 
-UniString aExt( pExt, RTL_TEXTENCODING_ASCII_US );
+OUString aExt = OStringToOUString( pExt, RTL_TEXTENCODING_ASCII_US );
 aFileName.SetExtension( aExt );
 
 return rtl::OUStringToOString(aFileName.GetFull(), 
RTL_TEXTENCODING_ASCII_US);
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 1452d42..d77fe907 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -117,20 +117,20 @@ private:
 comphelper::getProcessComponentContext() );
 static uno::Referencelang::XMultiComponentFactory  xServiceManager(
 xContext-getServiceManager() );
-static uno::Reference beans::XPropertySet  xProps( 
xServiceManager-createInstanceWithContext( rtl::OUString(  
com.sun.star.sheet.GlobalSheetSettings  ) ,xContext ), uno::UNO_QUERY_THROW );
+static uno::Reference beans::XPropertySet  xProps( 
xServiceManager-createInstanceWithContext( OUString(  
com.sun.star.sheet.GlobalSheetSettings  ) ,xContext ), uno::UNO_QUERY_THROW );
 return xProps;
 }
 
 bool getReplaceCellsWarning() throw ( uno::RuntimeException )
 {
 sal_Bool res = false;
-getGlobalSheetSettings()-getPropertyValue( 
rtl::OUString(REPLACE_CELLS_WARNING) ) = res;
+getGlobalSheetSettings()-getPropertyValue( 
OUString(REPLACE_CELLS_WARNING) ) = res;
 return ( res == sal_True );
 }
 
 void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
 {
-getGlobalSheetSettings()-setPropertyValue( 
rtl::OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
+getGlobalSheetSettings()-setPropertyValue( 
OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
 }
 public:
 PasteCellsWarningReseter() throw ( uno::RuntimeException )
@@ -260,7 +260,7 @@ getCurrentDocument() throw (uno::RuntimeException)
 
 
 uno::Any aModel;
-SbxVariable *pCompVar = basicChosen-Find(  UniString(ThisComponent), 
SbxCLASS_OBJECT );
+SbxVariable

[Libreoffice-commits] .: filter/source offapi/UnoApi_offapi.mk svx/inc svx/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source

2013-01-07 Thread Libreoffice Gerrit user

 filter/source/svg/svgreader.cxx  |   24 
 offapi/UnoApi_offapi.mk  |2 
 svx/inc/svx/xflgrit.hxx  |5 -
 svx/source/xoutdev/xattr.cxx |   19 ---
 xmloff/Library_xo.mk |1 
 xmloff/Package_inc.mk|1 
 xmloff/inc/xmloff/xmlstyle.hxx   |5 -
 xmloff/source/style/FillStyleContext.cxx |  151 ---
 xmloff/source/style/FillStyleContext.hxx |   67 -
 xmloff/source/style/GradientStyle.cxx|   12 --
 xmloff/source/style/xmlstyle.cxx |5 -
 11 files changed, 18 insertions(+), 274 deletions(-)

New commits:
commit eda0cec9ac990020e9da804ec3ed38e2cbfeeb77
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Mon Jan 7 22:27:41 2013 +0100

Revert dummy commit (WIP)

This reverts commit 6eb0522395c236ae6930a300992ad092449f9592.
It does not compile and the message and contents suggest it probably wasn't
meant to be pushed.

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 51a0860..5e9e994 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -179,6 +179,7 @@ struct AnnotatingVisitor
 case XML_LINEARGRADIENT:
 {
 const sal_Int32 nNumAttrs( xAttributes-getLength() );
+rtl::OUString sAttributeValue;
 maGradientVector.push_back(Gradient(Gradient::LINEAR));
 
 // do we have a reference to a parent gradient? parse
@@ -216,6 +217,7 @@ struct AnnotatingVisitor
 case XML_RADIALGRADIENT:
 {
 const sal_Int32 nNumAttrs( xAttributes-getLength() );
+rtl::OUString sAttributeValue;
 maGradientVector.push_back(Gradient(Gradient::RADIAL));
 
 // do we have a reference to a parent gradient? parse
@@ -253,6 +255,7 @@ struct AnnotatingVisitor
 case XML_STOP:
 {
 const sal_Int32 nNumAttrs( xAttributes-getLength() );
+rtl::OUString sAttributeValue;
 maGradientStopVector.push_back(GradientStop());
 
maGradientVector.back().maStops.push_back(maGradientStopVector.size()-1);
 for( sal_Int32 i=0; inNumAttrs; ++i )
@@ -515,8 +518,7 @@ struct AnnotatingVisitor
 double rRotate, rShearX;
 if( rState.maFillGradient.maTransform.decompose(rScale, 
rTranslate, rRotate, rShearX) )
 xAttrs-AddAttribute( draw:angle,
-  
rtl::OUString::valueOf(rRotate*1800.0/M_PI + 900) );
-SAL_INFO(svg, maStops   rState.maFillGradient.maStops[0]  
   rState.maFillGradient.maStops[1] );
+  
rtl::OUString::valueOf(rRotate*1800.0/M_PI ) );
 xAttrs-AddAttribute( draw:start-color,
   getOdfColor(
   maGradientStopVector[
@@ -811,11 +813,6 @@ struct AnnotatingVisitor
 const sal_Int32 nTokenId,
 const rtl::OUString sValue )
 {
-rtl::OString aValueUtf8( sValue.getStr(),
- sValue.getLength(),
- RTL_TEXTENCODING_UTF8 );
-
-SAL_INFO(svg, nTokenId   nTokenId);
 switch(nTokenId)
 {
 case XML_HREF:
@@ -839,18 +836,7 @@ struct AnnotatingVisitor
 case XML_STYLE:
 parseStyle( sValue );
 break;
-case XML_STOP_COLOR:
-parseColor( aValueUtf8.getStr(), io_rGradientStop.maStopColor 
);
-break;
-case XML_STOP_OPACITY:
-io_rGradientStop.maStopColor.a = sValue.toDouble();
-if (io_rGradientStop.maStopColor.a  0)
-io_rGradientStop.maStopColor.a = 0;
-else if (io_rGradientStop.maStopColor.a  1)
-io_rGradientStop.maStopColor.a = 1;
-break;
 default:
-SAL_INFO(svg, nTokenId unknown   getTokenName(nTokenId));
 break;
 }
 }
@@ -1045,11 +1031,9 @@ struct AnnotatingVisitor
 parseTextAlign(maCurrState,aValueUtf8.getStr());
 break;
 case XML_STOP_COLOR:
-SAL_INFO(svg, XML_STOP_COLOR1);
 if( maGradientVector.empty() ||
 maGradientVector.back().maStops.empty() )
 break;
-SAL_INFO(svg, XML_STOP_COLOR2);
 parseColor( aValueUtf8.getStr(),
 maGradientStopVector[
 
maGradientVector.back().maStops.back()].maStopColor );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 454b297..56e5f48 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk

[Libreoffice-commits] .: filter/source tools/inc tools/source unotools/inc unotools/source

2012-12-29 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltertestdialog.cxx |   90 ++-
 tools/inc/tools/tempfile.hxx |3 
 tools/source/fsys/tempfile.cxx   |  114 +-
 unotools/inc/unotools/tempfile.hxx   |3 
 unotools/source/ucbhelper/tempfile.cxx   |  180 +++
 5 files changed, 86 insertions(+), 304 deletions(-)

New commits:
commit f98407403f916f9a7474e93c674fc7ac360c3539
Author: Tor Lillqvist t...@iki.fi
Date:   Sat Dec 29 12:50:32 2012 +0200

Revert String Cleanup and news OUString methods/constructors

Broke a unit test and made all tinderboxes red.

This reverts commit 3179055dc3e267c961a5618c810fbc0df1858d72.

diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx 
b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index b48e3c8..0c04cad 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -67,6 +67,8 @@ using namespace com::sun::star::system;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
+using ::rtl::OUString;
+
 class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1 
com::sun::star::document::XEventListener 
 {
 public:
@@ -89,8 +91,8 @@ GlobalEventListenerImpl::GlobalEventListenerImpl( 
XMLFilterTestDialog* pDialog )
 void SAL_CALL GlobalEventListenerImpl::notifyEvent( const 
com::sun::star::document::EventObject Event ) throw (RuntimeException)
 {
 ::SolarMutexGuard aGuard;
-if( (Event.EventName.compareToAscii( OnFocus ) == 0) ||
-(Event.EventName.compareToAscii( OnUnload ) == 0) )
+if( (Event.EventName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(OnFocus) 
) == 0) ||
+(Event.EventName.compareToAscii( 
RTL_CONSTASCII_STRINGPARAM(OnUnload) ) == 0) )
 {
 Reference XComponent  xComp( Event.Source, UNO_QUERY );
 mpDialog-updateCurrentDocumentButtonState( xComp );
@@ -115,7 +117,7 @@ static bool checkComponent( Reference XComponent  
rxComponent, const OUString
 if ( rServiceName == com.sun.star.drawing.DrawingDocument )
 {
 // so if we want a draw we need to check if its not an 
impress
-if( !xInfo-supportsService( 
com.sun.star.presentation.PresentationDocument ) )
+if( !xInfo-supportsService( OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.PresentationDocument) 
) ) )
 return true;
 }
 else
@@ -273,10 +275,11 @@ void XMLFilterTestDialog::initDialog()
 if( NULL == m_pFilterInfo )
 return;
 
-OUString aTitle( m_sDialogTitle );
-aTitle = aTitle.replaceAll( %s, m_pFilterInfo-maFilterName );
+String aTitle( m_sDialogTitle );
+aTitle.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM(%s) ), 
m_pFilterInfo-maFilterName );
 SetText( aTitle );
 
+String aEmpty;
 bool bImport = (m_pFilterInfo-maFlags  1) == 1;
 bool bExport = (m_pFilterInfo-maFlags  2) == 2;
 
@@ -307,8 +310,8 @@ void XMLFilterTestDialog::onExportBrowse()
 com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
 0 );
 
-Reference XNameAccess  xFilterContainer( mxMSF-createInstance( 
com.sun.star.document.FilterFactory ), UNO_QUERY );
-Reference XNameAccess  xTypeDetection( mxMSF-createInstance( 
com.sun.star.document.TypeDetection ), UNO_QUERY );
+Reference XNameAccess  xFilterContainer( mxMSF-createInstance( 
OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.FilterFactory )) 
), UNO_QUERY );
+Reference XNameAccess  xTypeDetection( mxMSF-createInstance( 
OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.TypeDetection )) 
), UNO_QUERY );
 if( xFilterContainer.is()  xTypeDetection.is() )
 {
 Sequence OUString  aFilterNames( 
xFilterContainer-getElementNames() );
@@ -381,16 +384,19 @@ void XMLFilterTestDialog::onExportBrowse()
 for( n = 0; n  nCount; n++ )
 {
 if( n  0 )
-aExtension += ;;
-aExtension += *. + 
(*pExtensions++);
+aExtension += OUString( 
sal_Unicode(';') );
+aExtension += OUString( 
RTL_CONSTASCII_USTRINGPARAM( *. ));
+aExtension += (*pExtensions++);
 }
 }
 }
 }
 
-OUString aExtensions( aExtension );
-OUString aFilterName( aInterfaceName );
-aFilterName +=  ( + aExtensions + );
+

[Libreoffice-commits] .: filter/source tools/inc tools/source unotools/inc unotools/source

2012-12-28 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltertestdialog.cxx |   90 +--
 tools/inc/tools/tempfile.hxx |3 
 tools/source/fsys/tempfile.cxx   |  114 +-
 unotools/inc/unotools/tempfile.hxx   |3 
 unotools/source/ucbhelper/tempfile.cxx   |  180 +++
 5 files changed, 304 insertions(+), 86 deletions(-)

New commits:
commit 3179055dc3e267c961a5618c810fbc0df1858d72
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Thu Dec 27 11:28:45 2012 -0200

String Cleanup and news OUString methods/constructors

Change-Id: Ia6142020330d0e12650fdc519b66f00e607eac42
Reviewed-on: https://gerrit.libreoffice.org/1491
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx 
b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 0c04cad..b48e3c8 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -67,8 +67,6 @@ using namespace com::sun::star::system;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
-using ::rtl::OUString;
-
 class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1 
com::sun::star::document::XEventListener 
 {
 public:
@@ -91,8 +89,8 @@ GlobalEventListenerImpl::GlobalEventListenerImpl( 
XMLFilterTestDialog* pDialog )
 void SAL_CALL GlobalEventListenerImpl::notifyEvent( const 
com::sun::star::document::EventObject Event ) throw (RuntimeException)
 {
 ::SolarMutexGuard aGuard;
-if( (Event.EventName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(OnFocus) 
) == 0) ||
-(Event.EventName.compareToAscii( 
RTL_CONSTASCII_STRINGPARAM(OnUnload) ) == 0) )
+if( (Event.EventName.compareToAscii( OnFocus ) == 0) ||
+(Event.EventName.compareToAscii( OnUnload ) == 0) )
 {
 Reference XComponent  xComp( Event.Source, UNO_QUERY );
 mpDialog-updateCurrentDocumentButtonState( xComp );
@@ -117,7 +115,7 @@ static bool checkComponent( Reference XComponent  
rxComponent, const OUString
 if ( rServiceName == com.sun.star.drawing.DrawingDocument )
 {
 // so if we want a draw we need to check if its not an 
impress
-if( !xInfo-supportsService( OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.PresentationDocument) 
) ) )
+if( !xInfo-supportsService( 
com.sun.star.presentation.PresentationDocument ) )
 return true;
 }
 else
@@ -275,11 +273,10 @@ void XMLFilterTestDialog::initDialog()
 if( NULL == m_pFilterInfo )
 return;
 
-String aTitle( m_sDialogTitle );
-aTitle.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM(%s) ), 
m_pFilterInfo-maFilterName );
+OUString aTitle( m_sDialogTitle );
+aTitle = aTitle.replaceAll( %s, m_pFilterInfo-maFilterName );
 SetText( aTitle );
 
-String aEmpty;
 bool bImport = (m_pFilterInfo-maFlags  1) == 1;
 bool bExport = (m_pFilterInfo-maFlags  2) == 2;
 
@@ -310,8 +307,8 @@ void XMLFilterTestDialog::onExportBrowse()
 com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
 0 );
 
-Reference XNameAccess  xFilterContainer( mxMSF-createInstance( 
OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.FilterFactory )) 
), UNO_QUERY );
-Reference XNameAccess  xTypeDetection( mxMSF-createInstance( 
OUString( RTL_CONSTASCII_USTRINGPARAM( com.sun.star.document.TypeDetection )) 
), UNO_QUERY );
+Reference XNameAccess  xFilterContainer( mxMSF-createInstance( 
com.sun.star.document.FilterFactory ), UNO_QUERY );
+Reference XNameAccess  xTypeDetection( mxMSF-createInstance( 
com.sun.star.document.TypeDetection ), UNO_QUERY );
 if( xFilterContainer.is()  xTypeDetection.is() )
 {
 Sequence OUString  aFilterNames( 
xFilterContainer-getElementNames() );
@@ -384,19 +381,16 @@ void XMLFilterTestDialog::onExportBrowse()
 for( n = 0; n  nCount; n++ )
 {
 if( n  0 )
-aExtension += OUString( 
sal_Unicode(';') );
-aExtension += OUString( 
RTL_CONSTASCII_USTRINGPARAM( *. ));
-aExtension += (*pExtensions++);
+aExtension += ;;
+aExtension += *. + 
(*pExtensions++);
 }
 }
 }
 }
 
-String aExtensions( aExtension );
-

[Libreoffice-commits] .: filter/source

2012-12-21 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx |   15 -
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx  |   32 ++---
 2 files changed, 23 insertions(+), 24 deletions(-)

New commits:
commit 8efbd993d52289a4cf1193d2513df9e83bd583a8
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Dec 21 17:19:31 2012 -0200

More String cleanup in filter

Change-Id: Idf628ad51ebe9c841090a5e04c7986c15c726480
Reviewed-on: https://gerrit.libreoffice.org/1463
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx 
b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 5eb09d6..f8b868c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -25,7 +25,6 @@
 #include xmlfiltersettingsdialog.hxx
 #include xmlfilterhelpids.hrc
 
-using ::rtl::OUString;
 XMLFilterTabPageBasic::XMLFilterTabPageBasic( Window* pParent, ResMgr rResMgr 
) :
 TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_BASIC, rResMgr ) ),
 maFTFilterName( this, ResId( FT_XML_FILTER_NAME, rResMgr ) ),
@@ -48,7 +47,7 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic( Window* 
pParent, ResMgr rResMgr )
 std::vector application_info_impl* ::iterator aIter( rInfos.begin() );
 while( aIter != rInfos.end() )
 {
-XubString aEntry( (*aIter++)-maDocumentUIName );
+OUString aEntry( (*aIter++)-maDocumentUIName );
 maCBApplication.InsertEntry( aEntry );
 }
 }
@@ -57,24 +56,24 @@ XMLFilterTabPageBasic::~XMLFilterTabPageBasic()
 {
 }
 
-static OUString checkExtensions( const String rExtensions )
+static OUString checkExtensions( const OUString rExtensions )
 {
-const sal_Unicode* pSource = rExtensions.GetBuffer();
-sal_Int32 nCount = rExtensions.Len();
+const sal_Unicode* pSource = rExtensions.getStr();
+sal_Int32 nCount = rExtensions.getLength();
 
-String aRet;
+OUString aRet;
 while( nCount-- )
 {
 switch(*pSource)
 {
 case sal_Unicode(','):
-aRet += sal_Unicode(';');
+aRet += ;;
 break;
 case sal_Unicode('.'):
 case sal_Unicode('*'):
 break;
 default:
-aRet += *pSource;
+aRet += OUString( *pSource );
 }
 
 pSource++;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx 
b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index f1ccc52..25d19be 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -56,17 +56,17 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* 
pParent, ResMgr rResMgr, co
 maFTNeedsXSLT2( this, ResId (FT_XML_NEEDS_XSLT2, rResMgr ) ),
 maCBNeedsXSLT2( this, ResId (CB_XML_NEEDS_XSLT2, rResMgr ) ),
 
-sHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( http://; ) ),
-sSHTTPSchema( RTL_CONSTASCII_USTRINGPARAM( shttp://; ) ),
-sFILESchema( RTL_CONSTASCII_USTRINGPARAM( file:// ) ),
-sFTPSchema( RTL_CONSTASCII_USTRINGPARAM( ftp://; ) ),
-sInstPath( RTL_CONSTASCII_USTRINGPARAM( $(prog)/ ) )
+sHTTPSchema( http://; ),
+sSHTTPSchema( shttp://; ),
+sFILESchema( file:// ),
+sFTPSchema( ftp://; ),
+sInstPath( $(prog)/ )
 {
 FreeResource();
 
 try
 {
-css::uno::Reference XConfigManager  xCfgMgr( 
rxMSF-createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.config.SpecialConfigManager ))), UNO_QUERY );
+css::uno::Reference XConfigManager  xCfgMgr( rxMSF-createInstance( 
com.sun.star.config.SpecialConfigManager ), UNO_QUERY );
 if( xCfgMgr.is() )
 sInstPath = xCfgMgr-substituteVariables( sInstPath );
 }
@@ -120,23 +120,23 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox rURLBox, 
const OUString rURL )
 {
 OUString aPath;
 
-if( rURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM( 
file:// ) ) ) )
+if( rURL.matchIgnoreAsciiCase( file:// ) )
 {
 osl::FileBase::getSystemPathFromFileURL( rURL, aPath );
 
 rURLBox.SetBaseURL( rURL );
 rURLBox.SetText( aPath );
 }
-else if( rURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM( 
http://; ) ) ) ||
- rURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM( 
shttp://; ) ) ) ||
- rURL.matchIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM( 
ftp://; ) ) ) )
+else if( rURL.matchIgnoreAsciiCase( http://; ) ||
+ rURL.matchIgnoreAsciiCase( shttp://; ) ||
+ rURL.matchIgnoreAsciiCase( ftp://; ) )
 {
 rURLBox.SetBaseURL( rURL );
 rURLBox.SetText( rURL );
 }
 else if( !rURL.isEmpty() )
 {
-rtl::OUString aURL( rURL );
+OUString aURL( rURL );
 aURL = URIHelper::SmartRel2Abs( sInstPath, aURL, Link(), false );

[Libreoffice-commits] .: filter/source

2012-12-14 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d13ff131bf8da692dd1d88c18e97999b8cb5b639
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Dec 14 11:12:40 2012 +0200

Use replaceAll() correctly

Change-Id: Ic109d8c4777c4e927d665a5dc5dd76061763ba11

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 29c5d55..90c788a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete()
 
 OUString aPlaceHolder( %s );
 OUString aMessage(RESIDSTR(STR_WARN_DELETE));
-aMessage.replaceAll( aPlaceHolder, pInfo-maFilterName );
+aMessage = aMessage.replaceAll( aPlaceHolder, pInfo-maFilterName );
 
 WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES),
aMessage );
 if( aWarnBox.Execute() == RET_YES )
@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave()
 if( nFilters  0 )
 {
 aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
-aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
-aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
+aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
 }
 else
 {
 aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
-aMsg.replaceAll( sPlaceholder, (*aFilters.begin())-maFilterName );
-aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceAll( sPlaceholder, 
(*aFilters.begin())-maFilterName );
+aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
 }
 
 InfoBox aBox(this, aMsg );
@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
 {
 INetURLObject aURLObj( aURL );
 aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
-aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
+aMsg = aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
 }
 else if( nFilters == 1 )
 {
 aMsg = RESIDSTR(STR_FILTER_INSTALLED);
-aMsg.replaceAll( sPlaceholder, aFilterName );
+aMsg = aMsg.replaceAll( sPlaceholder, aFilterName );
 
 }
 else
 {
 aMsg = RESIDSTR(STR_FILTERS_INSTALLED);
-aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
+aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
 }
 
 InfoBox aBox(this, aMsg );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-12-14 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f15e01ab033e93f58d29791ef6ffc932599fb33f
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Dec 14 15:34:51 2012 +0400

there was SearchAndReplace which replaces the first occurrence

Change-Id: I2fd4356ed8dcf2567912e417aa57b12b4a23a245

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 90c788a..4df5dd0 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete()
 
 OUString aPlaceHolder( %s );
 OUString aMessage(RESIDSTR(STR_WARN_DELETE));
-aMessage = aMessage.replaceAll( aPlaceHolder, pInfo-maFilterName );
+aMessage = aMessage.replaceFirst( aPlaceHolder, pInfo-maFilterName );
 
 WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES),
aMessage );
 if( aWarnBox.Execute() == RET_YES )
@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave()
 if( nFilters  0 )
 {
 aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
-aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
-aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
 }
 else
 {
 aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
-aMsg = aMsg.replaceAll( sPlaceholder, 
(*aFilters.begin())-maFilterName );
-aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder, 
(*aFilters.begin())-maFilterName );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
 }
 
 InfoBox aBox(this, aMsg );
@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
 {
 INetURLObject aURLObj( aURL );
 aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
-aMsg = aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURLObj.GetName() );
 }
 else if( nFilters == 1 )
 {
 aMsg = RESIDSTR(STR_FILTER_INSTALLED);
-aMsg = aMsg.replaceAll( sPlaceholder, aFilterName );
+aMsg = aMsg.replaceFirst( sPlaceholder, aFilterName );
 
 }
 else
 {
 aMsg = RESIDSTR(STR_FILTERS_INSTALLED);
-aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
+aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf( 
static_castsal_Int32(nFilters) ) );
 }
 
 InfoBox aBox(this, aMsg );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-12-13 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |  111 +--
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |2 
 2 files changed, 56 insertions(+), 57 deletions(-)

New commits:
commit 3d5789d48d6602832abd33268e31afa4080cb87a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Wed Dec 12 13:26:57 2012 -0200

String removal in filter

Change-Id: I170d132e9329dd58ed6dc9bbf4094c234d122592
Reviewed-on: https://gerrit.libreoffice.org/1309
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index edf23e1..29c5d55 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -52,7 +52,6 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 
-using ::rtl::OUString;
 using ::rtl::Uri;
 
 XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent,
@@ -90,11 +89,11 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* 
pParent,
 
 try
 {
-mxFilterContainer = Reference XNameContainer ::query( 
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.document.FilterFactory )) ) );
-mxTypeDetection = Reference XNameContainer ::query( 
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.document.TypeDetection )) ));
-mxExtendedTypeDetection = Reference XNameContainer ::query( 
rxMSF-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.document.ExtendedTypeDetectionFactory )) ) );
+mxFilterContainer = Reference XNameContainer ::query( 
rxMSF-createInstance( com.sun.star.document.FilterFactory ) );
+mxTypeDetection = Reference XNameContainer ::query( 
rxMSF-createInstance( com.sun.star.document.TypeDetection ) );
+mxExtendedTypeDetection = Reference XNameContainer ::query( 
rxMSF-createInstance( com.sun.star.document.ExtendedTypeDetectionFactory ) );
 
-Reference XConfigManager  xCfgMgr( mxMSF-createInstance(OUString( 
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.config.SpecialConfigManager )) ), 
UNO_QUERY );
+Reference XConfigManager  xCfgMgr( mxMSF-createInstance( 
com.sun.star.config.SpecialConfigManager ), UNO_QUERY );
 if( xCfgMgr.is() )
 {
 m_sTemplatePath = xCfgMgr-substituteVariables( m_sTemplatePath );
@@ -198,7 +197,7 @@ void XMLFilterSettingsDialog::updateStates()
 sal_Int32 nFact = SvtModuleOptions::E_WRITER;
 while(nFact = SvtModuleOptions::E_BASIC)
 {
-::rtl::OUString sDefault = 
maModuleOpt.GetFactoryDefaultFilter((SvtModuleOptions::EFactory)nFact);
+OUString sDefault = 
maModuleOpt.GetFactoryDefaultFilter((SvtModuleOptions::EFactory)nFact);
 if( sDefault == pInfo-maFilterName )
 {
 bIsDefault = true;
@@ -224,14 +223,14 @@ void XMLFilterSettingsDialog::onNew()
 aTempInfo.maFilterName = 
createUniqueFilterName(RESIDSTR(STR_DEFAULT_FILTER_NAME));
 
 // init default extension
-String aDefaultExtension(RESIDSTR(STR_DEFAULT_EXTENSION));
+OUString aDefaultExtension(RESIDSTR(STR_DEFAULT_EXTENSION));
 aTempInfo.maExtension = aDefaultExtension;
 
 // set default ui name
 aTempInfo.maInterfaceName = 
createUniqueInterfaceName(RESIDSTR(STR_DEFAULT_UI_NAME));
 
 // set default application
-aTempInfo.maDocumentService = OUString( RTL_CONSTASCII_USTRINGPARAM( 
com.sun.star.text.TextDocument ));
+aTempInfo.maDocumentService = com.sun.star.text.TextDocument;
 
 // execute XML Filter Dialog
 XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxMSF, aTempInfo );
@@ -273,7 +272,7 @@ void XMLFilterSettingsDialog::onEdit()
 
 /** helper to create a sequence of strings from an extensions strings
 ext1;ext2;ext3 will become { ext1, ext2, ext3 } */
-static Sequence OUString  createExtensionsSequence( const rtl::OUString 
rExtensions )
+static Sequence OUString  createExtensionsSequence( const OUString 
rExtensions )
 {
 // first count how many extensions we have inside the string
 int nExtensions = 0;
@@ -419,7 +418,7 @@ OUString 
XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString rIn
 if( nDefaultNumber )
 {
 aInterfaceName += OUString( sal_Unicode( ' ' ) );
-aInterfaceName += String::CreateFromInt32( nDefaultNumber );
+aInterfaceName += OUString::valueOf( 
static_castsal_Int32(nDefaultNumber) );
 }
 
 return aInterfaceName;
@@ -540,28 +539,28 @@ bool XMLFilterSettingsDialog::insertOrEdit( 
filter_info_impl* pNewInfo, const fi
 // 3. create property values for filter entry
 Sequence PropertyValue  aFilterData( 8 );
 
-aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( Type )

[Libreoffice-commits] .: filter/source

2012-12-13 Thread Libreoffice Gerrit user

 filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu  |  
  2 +-
 filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu |  
  2 +-
 filter/source/config/fragments/filters/MS_Excel_95.xcu  |  
  2 +-
 filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu |  
  2 +-
 filter/source/config/fragments/filters/MS_WinWord_6_0.xcu   |  
  2 +-
 filter/source/config/fragments/filters/MS_Word_95.xcu   |  
  2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 664d465a4b0f02200748067c0693eb95444174d4
Author: Bryan Quigley b...@bryanquigley.com
Date:   Wed Dec 12 15:34:12 2012 -0500

Removed save to Office 6.0/95 formats

Change-Id: Ifeeb85afbd2531be772e27e10c6283158f0dac09

diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu 
b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu
index d7fc944..bd8423b 100644
--- a/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS Excel 5.0/95 oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserData/
diff --git 
a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu 
b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
index edfb473..4542d27 100644
--- 
a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
+++ 
b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS Excel 5.0/95 Vorlage/Template oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE 
TEMPLATEPATH/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE 
TEMPLATEPATH/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserData/
diff --git a/filter/source/config/fragments/filters/MS_Excel_95.xcu 
b/filter/source/config/fragments/filters/MS_Excel_95.xcu
index 79d259d..4e227ca 100644
--- a/filter/source/config/fragments/filters/MS_Excel_95.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_95.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS Excel 95 oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN PREFERRED/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN PREFERRED/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserData/
diff --git 
a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu 
b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
index 1ef6756..a5eab88 100644
--- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS Excel 95 Vorlage/Template oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN TEMPLATE 
TEMPLATEPATH/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN TEMPLATE 
TEMPLATEPATH/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserData/
diff --git a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu 
b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu
index 00a3aa4..e784b52 100644
--- a/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu
+++ b/filter/source/config/fragments/filters/MS_WinWord_6_0.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS WinWord 6.0 oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueCWW6/value/prop
diff --git a/filter/source/config/fragments/filters/MS_Word_95.xcu 
b/filter/source/config/fragments/filters/MS_Word_95.xcu
index ffea860..356b8fa 100644
--- a/filter/source/config/fragments/filters/MS_Word_95.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_95.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 --
 node oor:name=MS Word 95 oor:op=replace
-prop oor:name=FlagsvalueIMPORT EXPORT ALIEN/value/prop
+prop oor:name=FlagsvalueIMPORT ALIEN/value/prop
 prop oor:name=UIComponent/
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueCWW6/value/prop

[Libreoffice-commits] .: filter/source

2012-12-11 Thread Libreoffice Gerrit user

 filter/source/xsltdialog/xmlfiltertabdialog.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c88508bc53e7df7ead7bc1b102da3d7dd81f7688
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Dec 11 16:24:26 2012 +0400

OUString::replaceAll unused results

Change-Id: I8d8dd139e57fb00decda8705157480439009cde8

diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx 
b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 9e9f462..2808375 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -55,7 +55,7 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, 
ResMgr rResMgr, const
 mpNewInfo = new filter_info_impl( *mpOldInfo );
 
 OUString aTitle( GetText() );
-aTitle.replaceAll(%s, mpNewInfo-maFilterName);
+aTitle = aTitle.replaceAll(%s, mpNewInfo-maFilterName);
 SetText( aTitle );
 
 maTabCtrl.Show();
@@ -277,12 +277,12 @@ bool XMLFilterTabDialog::onOk()
 
 if( aReplace2.getLength() )
 {
-aMessage.replaceAll( %s1, aReplace1 );
-aMessage.replaceAll( %s2, aReplace2 );
+aMessage = aMessage.replaceAll( %s1, aReplace1 );
+aMessage = aMessage.replaceAll( %s2, aReplace2 );
 }
 else if( aReplace1.getLength() )
 {
-aMessage.replaceAll( %s, aReplace1 );
+aMessage = aMessage.replaceAll( %s, aReplace1 );
 }
 
 ErrorBox aBox(this, (WinBits)(WB_OK), aMessage );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-12-09 Thread Libreoffice Gerrit user

 filter/source/config/tools/merge/pyAltFCFGMerge |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d83b27aed3097a8e25e8e56e2af796205f826270
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 9 23:45:05 2012 +0100

Python/pep8: fix E711 in filter/../pyAltFCFGMerge

Change-Id: I0c6fab8829ad7cc434791a0ef1743eb1d50417d9

diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge 
b/filter/source/config/tools/merge/pyAltFCFGMerge
index b05e37d..e09178d 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -247,8 +247,8 @@ def readprops(buff):
 
 i += 1
 
-# no dlimiter was found, name is entire line, there is no value
-if name == None:
+# no delimiter was found, name is entire line, there is no value
+if name is None:
 name = unescapestr(line.lstrip())
 
 # skip delimiter
@@ -340,12 +340,12 @@ class ConfigHelper:
 # Do it only, if a valid file name was given.
 # But in case this file name is wrong, throw an exception.
 # So the outside code can react!
-if sPropFile != None and len(sPropFile)  0:
+if sPropFile is not None and len(sPropFile)  0:
 self.props = Properties()
 self.props.read(sPropFile)
 
 count = 0
-if lCommandLineArgs != None:
+if lCommandLineArgs is not None:
 count = len(lCommandLineArgs)
 self.m_bEmpty = (count  1)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-12-08 Thread Libreoffice Gerrit user

 filter/source/svg/svgreader.cxx |  158 
 1 file changed, 80 insertions(+), 78 deletions(-)

New commits:
commit f21e7f8d5875f0cb7592279ac515124b8ca7186c
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Fri May 18 21:07:41 2012 +0200

SVG: handle degenerate cases of the basic shapes correctly

Change-Id: I2dc488ba38ca5f63c716f5f7327b47769d289fff

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index ecbc844..92b8fb9 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -75,56 +75,6 @@ namespace svgi
 namespace
 {
 
-void lcl_RectAttrs2Polygon( const uno::Referencexml::dom::XNamedNodeMap 
xAttributes, const State rCurrState, basegfx::B2DPolygon rPoly )
-{
-// collect attributes
-const sal_Int32 nNumAttrs( xAttributes-getLength() );
-rtl::OUString sAttributeValue;
-bool bRxSeen=false, bRySeen=false;
-double x=0.0,y=0.0,width=0.0,height=0.0,rx=0.0,ry=0.0;
-for( sal_Int32 i=0; inNumAttrs; ++i )
-{
-sAttributeValue = xAttributes-item(i)-getNodeValue();
-const sal_Int32 nAttribId(
-  
getTokenId(xAttributes-item(i)-getNodeName()));
-switch(nAttribId)
-{
-case XML_X:
-x = convLength(sAttributeValue,rCurrState,'h');
-break;
-case XML_Y:
-y = convLength(sAttributeValue,rCurrState,'v');
-break;
-case XML_WIDTH:
-width = convLength(sAttributeValue,rCurrState,'h');
-break;
-case XML_HEIGHT:
-height = convLength(sAttributeValue,rCurrState,'v');
-break;
-case XML_RX:
-rx = convLength(sAttributeValue,rCurrState,'h');
-bRxSeen=true;
-break;
-case XML_RY:
-ry = convLength(sAttributeValue,rCurrState,'v');
-bRySeen=true;
-break;
-default:
-// skip
-break;
-}
-}
-
-if( bRxSeen  !bRySeen )
-ry = rx;
-else if( bRySeen  !bRxSeen )
-rx = ry;
-
-rPoly = basegfx::tools::createPolygonFromRect(
-basegfx::B2DRange(x,y,x+width,y+height),
-rx/(0.5*width), ry/(0.5*height) );
-}
-
 /** visits all children of the specified type with the given functor
  */
 templatetypename Func void visitChildren(const Func rFunc,
@@ -1097,7 +1047,7 @@ struct AnnotatingVisitor
   
maGradientVector.back().maStops.back()].maStopColor );
 break;
 default:
-OSL_TRACE(unhandled token %s, getTokenName(nTokenId));
+SAL_INFO(svg, unhandled token   getTokenName(nTokenId));
 break;
 }
 }
@@ -1307,17 +1257,20 @@ struct ShapeWritingVisitor
 }
 }
 
-rtl::OUString sLinePath = M+rtl::OUString::valueOf(x1)+,
-
+rtl::OUString::valueOf(y1)+L+rtl::OUString::valueOf(x2)+,
-+rtl::OUString::valueOf(y2);
-basegfx::B2DPolyPolygon aPoly;
-basegfx::tools::importFromSvgD(aPoly, sLinePath);
+if ( x1 != x2 || y1 != y2 ) {
+rtl::OUString sLinePath = 
M+rtl::OUString::valueOf(x1)+,
+
+rtl::OUString::valueOf(y1)+L+rtl::OUString::valueOf(x2)+,
++rtl::OUString::valueOf(y2);
+basegfx::B2DPolyPolygon aPoly;
+basegfx::tools::importFromSvgD(aPoly, sLinePath);
+
+writePathShape(xAttrs,
+   xUnoAttrs,
+   xElem,
+   sStyleId,
+   basegfx::B2DPolyPolygon(aPoly));
+}
 
-writePathShape(xAttrs,
-   xUnoAttrs,
-   xElem,
-   sStyleId,
-   basegfx::B2DPolyPolygon(aPoly));
 break;
 }
 case XML_POLYGON:
@@ -1338,14 +1291,61 @@ struct ShapeWritingVisitor
 }
 case XML_RECT:
 {
-basegfx::B2DPolygon aPoly;
+// collect attributes
+const sal_Int32 nNumAttrs( xAttributes-getLength() );
+rtl::OUString sAttributeValue;
+bool bRxSeen=false, bRySeen=false;
+double x=0.0,y=0.0,width=0.0,height=0.0,rx=0.0,ry=0.0;
+for( sal_Int32 i=0; inNumAttrs; ++i )
+{
+sAttributeValue = xAttributes-item(i)-getNodeValue();
+const sal_Int32 nAttribId(
+  
getTokenId(xAttributes-item(i)-getNodeName()));
+switch(nAttribId)
+{
+

[Libreoffice-commits] .: filter/source

2012-12-06 Thread Libreoffice Gerrit user

 filter/source/svg/svgwriter.cxx |5 ++---
 filter/source/svg/svgwriter.hxx |3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d96c0ee8e9ad0f777bed009e87401e6f684af446
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 6 16:43:16 2012 +0100

-Werror,-Wunused-private-field

Change-Id: Ia567a2e7f8089ad193af98443e5d662e744fcff7

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..332ff7e 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -440,9 +440,8 @@ void SVGAttributeWriter::setFontFamily()
 // - SVGTextWriter -
 // ---
 
-SVGTextWriter::SVGTextWriter( SVGExport rExport, SVGFontExport rFontExport )
+SVGTextWriter::SVGTextWriter( SVGExport rExport )
 :   mrExport( rExport ),
-mrFontExport( rFontExport ),
 mpContext( NULL ),
 mpVDev( NULL ),
 mbIsTextShapeStarted( sal_False ),
@@ -1941,7 +1940,7 @@ SVGActionWriter::SVGActionWriter( SVGExport rExport, 
SVGFontExport rFontExport
 mrExport( rExport ),
 mrFontExport( rFontExport ),
 mpContext( NULL ),
-maTextWriter( rExport, rFontExport ),
+maTextWriter( rExport ),
 mnInnerMtfCount( 0 ),
 mbClipAttrChanged( sal_False )
 {
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..ce2e441 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -196,7 +196,6 @@ class SVGTextWriter
 
   private:
 SVGExport  mrExport;
-SVGFontExport  mrFontExport;
 SVGAttributeWriter* mpContext;
 VirtualDevice*  mpVDev;
 sal_BoolmbIsTextShapeStarted;
@@ -230,7 +229,7 @@ class SVGTextWriter
 FontmaParentFont;
 
   public:
-SVGTextWriter( SVGExport rExport, SVGFontExport rFontExport );
+SVGTextWriter( SVGExport rExport );
 virtual ~SVGTextWriter();
 
 sal_Int32 setTextPosition( const GDIMetaFile rMtf, sal_uLong nCurAction 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-12-03 Thread Libreoffice Gerrit user

 filter/source/svg/svgwriter.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit b49ea0c9d24aa48d62590cb3443c3ad4143d2e2f
Author: Horacio Fernandes horacio.fernan...@gmail.com
Date:   Sun Dec 2 17:52:26 2012 -0400

fdo#57215: Fixed wrong text rotation in SVG Export

Added text rotation to non-positioned characters in SVG Export.

Change-Id: I831644329625fa74e5a2436096d26ec22d8b0319
Reviewed-on: https://gerrit.libreoffice.org/1227
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index b9e556d..2f269ba 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1520,6 +1520,27 @@ void SVGTextWriter::startTextPosition( sal_Bool 
bExportX, sal_Bool bExportY )
 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, 
::rtl::OUString::valueOf( maTextPos.X() ) );
 if( bExportY )
 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, 
::rtl::OUString::valueOf( maTextPos.Y() ) );
+
+// if text is rotated, set transform matrix at new tspan element
+const Font rFont = mpVDev-GetFont();
+if( rFont.GetOrientation() )
+{
+Point   aRot( maTextPos );
+OUString aTransform( translate( );
+aTransform += OUString::valueOf( aRot.X() ) + ,;
+aTransform += OUString::valueOf( aRot.Y() ) + );
+
+aTransform +=  rotate(;
+aTransform += OUString::valueOf( rFont.GetOrientation() * -0.1 );
+aTransform += );
+
+aTransform +=  translate(;
+aTransform += OUString::valueOf( -aRot.X() ) + ,;
+aTransform += OUString::valueOf( -aRot.Y() ) + );
+
+mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, 
aTransform );
+}
+
 mpTextPositionElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, 
aXMLElemTspan, mbIWS, mbIWS );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-29 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   12 
--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 3f6946cfd7021dccdc3c2787442d20c168c197d1
Author: Peter Jentsch pj...@guineapics.de
Date:   Thu Nov 29 21:53:24 2012 +0100

fix fdo#57641 table alignment broken in XHTML export

Change-Id: Ibbb88c1ecaaac14866145753e383609db2a3dd1a

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index b7573fe..986dd3d 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -297,9 +297,17 @@
xsl:template match=@table:align
xsl:choose
xsl:when test=.='left'
-   xsl:textmargin-left:0px; 
margin-right:auto;/xsl:text/xsl:when
+   xsl:if 
test=not(../@fo:margin-left)margin-left:0px; /xsl:if
+   
xsl:textmargin-right:auto;/xsl:text/xsl:when
xsl:when test=.='right'
-   xsl:textmargin-left:auto; margin-right: 
0px;/xsl:text/xsl:when
+   xsl:textmargin-left:auto/xsl:text
+   xsl:if test=not(../@fo:margin-right)
+   ; margin-right: 0px;
+   /xsl:if
+   /xsl:when
+   xsl:when test=.='center'
+   margin-left:auto;margin-right:auto;
+   /xsl:when
xsl:otherwise
xsl:textfloat:none; /xsl:text
/xsl:otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-29 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/body.xsl |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 60ce4dc080c2b0da2a9d5776176755d97a1b161d
Author: Peter Jentsch pj...@guineapics.de
Date:   Thu Nov 29 23:15:15 2012 +0100

fix fdo#57647 intradocument xrefs broken in xhtml

Change-Id: Idce1f295dbf74eb3f02da1f32f290c20126c516b

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index 37a8afa..3196fac 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -130,8 +130,9 @@
!-- *** References  *** --
!-- *** --
 
-   xsl:template match=text:reference-ref | text:sequence-ref
+   xsl:template match=text:reference-ref | text:sequence-ref | 
text:bookmark-ref
xsl:param name=globalData/
+   xsl:if test=*|text()
xsl:element namespace={$namespace} name=a
xsl:attribute name=href
xsl:text#/xsl:text
@@ -150,7 +151,9 @@
xsl:apply-templates select=@* | node()
xsl:with-param name=globalData 
select=$globalData/
/xsl:apply-templates
+   
/xsl:element
+   /xsl:if
/xsl:template
 
 xsl:template match=@text:name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-28 Thread Libreoffice Gerrit user

 filter/source/msfilter/escherex.cxx |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 1f1ebf7d91d1b19c05d7114853ecdc40c8444a6a
Author: Lennard wassert...@nefkom.net
Date:   Sun Nov 25 14:50:42 2012 +0100

fdo#34897 numbers were wrong, code unnecessary

Text flow is perhaps not intended to specify rotation, created data may 
misbehave on
other applications, and there is no reason for this unnecessary special 
case.
(Especially obvious because there is no text flow that causes 180 deg 
rotation.)
Theoretically, you could delete all three if-cases as in the earlier 
version of this patch,
but that ?could? come at the cost of backwards compatibility.

Change-Id: I0b1cac78e549c2126d7e45298629e28fc76ac95d
Signed-off-by: Lennard wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/1165
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 5bf85dd..f27f2b9 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -690,16 +690,10 @@ void EscherPropertyContainer::CreateTextProperties(
 sal_True )
 ? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0;
 if (nAngle==900) {
-AddOpt( ESCHER_Prop_txflTextFlow, 1 );
-bSuppressRotation=true;
-}
-if (nAngle==1800) {
-AddOpt( ESCHER_Prop_txflTextFlow, 2 );
-bSuppressRotation=true;
+AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT );
 }
 if (nAngle==2700) {
-AddOpt( ESCHER_Prop_txflTextFlow, 3 );
-bSuppressRotation=true;
+AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflTtoBA );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-27 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/body.xsl |2 +-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b75e9576bfaf9f95532f2a9d6917cffbf37a57e0
Author: Peter Jentsch pj...@guineapics.de
Date:   Wed Nov 28 00:33:01 2012 +0100

fix fdo#40097 - Cross-references and TOC links broken in XHTML export

Change-Id: I90bd2a8d5f788350f8f2bc8c443776e6598624b4

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index 895bb41..37a8afa 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -317,7 +317,7 @@
 
xsl:choose
!-- internal OOo URL used in content tables --
-   xsl:when test=contains($href, '%7Coutline')
+   xsl:when test=contains($href, '%7Coutline') or 
contains($href, '|outline')
!-- the simple workaround for content tables 
in a single document is to create create an anchor from every heading element
 work-around downside: Multiple 
identical headings won't refer always to the first.
--
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 6189629..d9de0e9 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1243,7 +1243,7 @@
!-- REFERENCE HANDLING - ANCHOR --
xsl:element namespace={$namespace} name=a
xsl:attribute name=id
-   xsl:value-of 
select=translate(concat('a_',$headingNumber, '_', normalize-space($title)), 
'#xA;amp;lt;gt;.,;: %()[]/\+', '___')/
+   xsl:value-of 
select=translate(concat('a_',normalize-space($headingNumber), '_', 
normalize-space($title)), '#xA;amp;lt;gt;.,;: %()[]/\+', 
'___')/
/xsl:attribute
 
xsl:element name=span
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-26 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |   40 +++
 1 file changed, 8 insertions(+), 32 deletions(-)

New commits:
commit c8836e0b6d67ff7f4be04fe72ca9834fc5b5b0b7
Author: Peter Jentsch pj...@guineapics.de
Date:   Sun Nov 25 20:45:52 2012 +0100

fix: fdo#55610 - FILESAVE: CRASH when exporting particular .odt to XHTML

Change-Id: I2456f35a2aab9cefb11d2412c86ddaf06fc3afd4

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index b4876a8..556d317 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -118,45 +118,21 @@
 
xsl:template name=write-mapped-CSS-styles
xsl:param name=globalData /
-   xsl:param name=styleNo select=1/
xsl:param name=emptyStyles/
 
-   xsl:choose
-   xsl:when test=$globalData/all-styles/style[$styleNo]
-   !-- If there is still a style to be written --
-   !-- setting the context --
-   xsl:for-each 
select=$globalData/all-styles/style[$styleNo]
-   xsl:choose
-   xsl:when test=final-properties != ''
-   !-- NOTE: easy process, as only the 
style family in conjunction with the style name, makes the style unambigous --
-   xsl:text./xsl:text!--xsl:value-of 
select=@style:family /xsl:text:/xsl:text--xsl:value-of 
select=translate(@style:name, '.,;: %()[]/\+', '_')/xsl:text { 
/xsl:text xsl:value-of select=final-properties /xsl:text}
+   xsl:for-each select=$globalData/all-styles/style
+   xsl:if test=final-properties != ''
+   !-- NOTE: easy process, as 
only the style family in conjunction with the style name, makes the style 
unambigous --
+   
xsl:text./xsl:text!--xsl:value-of select=@style:family 
/xsl:text:/xsl:text--xsl:value-of select=translate(@style:name, '.,;: 
%()[]/\+', '_')/xsl:text { /xsl:text xsl:value-of 
select=final-properties /xsl:text}
/xsl:text
-   xsl:call-template 
name=write-mapped-CSS-styles
-   xsl:with-param 
name=globalData select=$globalData /
-   xsl:with-param 
name=emptyStyles select=$emptyStyles/
-   xsl:with-param 
name=styleNo select=$styleNo + 1/
-   /xsl:call-template
-   /xsl:when
-   xsl:otherwise
-   xsl:call-template 
name=write-mapped-CSS-styles
-   xsl:with-param 
name=globalData select=$globalData /
-   xsl:with-param 
name=emptyStyles select=concat($emptyStyles, '.', @style:name, ' ')/
-   xsl:with-param 
name=styleNo select=$styleNo + 1/
-   /xsl:call-template
-   /xsl:otherwise
-   /xsl:choose
-   /xsl:for-each
-   /xsl:when
-   xsl:otherwise
+   /xsl:if
+   
+   /xsl:for-each
!-- Otherwise all styles have been processed and the 
empty styles have to be given out --
xsl:comment ODF styles with no properties 
representable as CSS /xsl:commentxsl:text
-   /xsl:textxsl:value-of select=$emptyStyles/xsl:text{ }
-   /xsl:text
-   /xsl:otherwise
-   /xsl:choose
+   /xsl:textxsl:for-each 
select=$globalData/all-styles/style[final-properties = '']xsl:value-of 
select=concat('.', @style:name, ' ')//xsl:for-each { }
/xsl:template
 
-
!-- Creating CSS page layout based on first office master style --
xsl:template name='create-page-layout'
xsl:param name=globalData /
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-26 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/body.xsl |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2a9c7f044f03533604e34216d5b8f6e217609832
Author: Peter Jentsch pj...@guineapics.de
Date:   Sun Nov 25 23:21:19 2012 +0100

fix fdo#56595 - FILESAVE: ToC links broken in xhtml export

Change-Id: Ic79d4356902570084e024d8891307668b17d97f3

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index 618b842..895bb41 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -358,6 +358,10 @@
xsl:value-of 
select=concat($href, $optionalURLSuffix)/
/xsl:when
 !-- for relative URLs 
--
+xsl:when 
test=starts-with($href, '#')
+  !-- intra document 
ref --
+  xsl:value-of 
select=$href/
+/xsl:when
xsl:otherwise
xsl:value-of 
select=concat($sourceBaseURL, $href, $optionalURLSuffix)/
/xsl:otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-26 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |2 
+
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   11 
++
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 6aabe09ac092c51d4b394bde9c7ea0055b952e33
Author: Peter Jentsch pj...@guineapics.de
Date:   Mon Nov 26 01:26:37 2012 +0100

fix fdo#56596 - FILESAVE: huge excesses of white space in xhtml...

Change-Id: Ideb395c1f1bc22d5b23d1c949ec6221e04590a2e

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index b95cda7..9b02d94 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -800,6 +800,8 @@
 /xsl:otherwise
 /xsl:choose
/xsl:template
+   !-- workaround AOOO#119401 suspicious property fo:margin=100% in 
paragraph style --
+   xsl:template match=@fo:margin[string(.) = '100%'] 
mode=paragraphMerge/
 
xsl:template mode=paragraphMerge match=@fo:margin | @fo:margin-top 
| @fo:margin-bottom | @fo:margin-left | @fo:margin-right
xsl:textpadding/xsl:text
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 785f9bd..1dedcc2 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -83,10 +83,13 @@
xsl:text; /xsl:text
/xsl:template
 
-   !-- Maps fo:margin as well fo:margin-top, fo:margin-bottom, 
fo:padding-left, fo:margin-right --
-   !-- Maps fo:padding as well fo:padding-top, fo:padding-bottom, 
fo:padding-left, fo:padding-right --
-   xsl:template match=@fo:letter-spacing | @fo:line-height | @fo:width 
|@fo:margin | @fo:margin-top | @fo:margin-bottom | @fo:margin-left | 
@fo:margin-right | @fo:padding | @fo:padding-top | @fo:padding-bottom | 
@fo:padding-left | @fo:padding-right
-   xsl:value-of select=substring-after(name(), ':')/
+   !-- workaround AOOO#119401 suspicious property fo:margin=100% in 
paragraph style --
+   xsl:template match=@fo:margin[string(.) = '100%']/ 
+
+   !-- Maps fo:margin as well fo:margin-top, fo:margin-bottom, 
fo:padding-left, fo:margin-right --
+   !-- Maps fo:padding as well fo:padding-top, fo:padding-bottom, 
fo:padding-left, fo:padding-right --
+   xsl:template match=@fo:letter-spacing | @fo:line-height | @fo:width 
|@fo:margin | @fo:margin-top | @fo:margin-bottom | @fo:margin-left | 
@fo:margin-right | @fo:padding | @fo:padding-top | @fo:padding-bottom | 
@fo:padding-left | @fo:padding-right   
+   xsl:value-of select=local-name(.)/
xsl:text:/xsl:text
!-- Map once erroneusly used inch shortage 'inch' to CSS 
shortage 'in' --
xsl:choose
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-26 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   11 
+-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 5781a5ea3d502332cda77ab75aa7ddd1c9ca36f7
Author: Peter Jentsch pj...@guineapics.de
Date:   Mon Nov 26 21:40:56 2012 +0100

fdo#57575 (xhtml hairline borders), fdo#57538 - xhtml right just borders.

Change-Id: I9788e80829e4e9af17b4e2fd203849ca0b5e9899

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 1dedcc2..b7573fe 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -56,7 +56,10 @@
 
xsl:value-of select=$borderType/
xsl:text-width:/xsl:text
-   xsl:value-of select=$borderWidthFixed/
+   xsl:choose
+   xsl:when test=$borderWidth = 
'0.05pt'thin/xsl:when
+   xsl:otherwisexsl:value-of 
select=$borderWidthFixed//xsl:otherwise
+   /xsl:choose
xsl:text; /xsl:text
xsl:value-of select=$borderType/
xsl:text-style:/xsl:text
@@ -294,11 +297,9 @@
xsl:template match=@table:align
xsl:choose
xsl:when test=.='left'
-   !-- Note: problems with meeting minutes example
-   xsl:textfloat:right; /xsl:text 
--/xsl:when
+   xsl:textmargin-left:0px; 
margin-right:auto;/xsl:text/xsl:when
xsl:when test=.='right'
-   !-- Note: problems with meeting minutes example
-   xsl:textfloat:left; /xsl:text --/xsl:when
+   xsl:textmargin-left:auto; margin-right: 
0px;/xsl:text/xsl:when
xsl:otherwise
xsl:textfloat:none; /xsl:text
/xsl:otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-26 Thread Libreoffice Gerrit user

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 7ce4ca1c49c1183ffb32b0e7f85e29e3d5b2eb37
Author: Peter Jentsch pj...@guineapics.de
Date:   Mon Nov 26 23:33:12 2012 +0100

fdo#56598 - no whitespace after section numbers in XHTML export

Change-Id: I437b936e37ab577f29736bf413312ba9af393987

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index af58903..6189629 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1262,6 +1262,11 @@
xsl:textcm;/xsl:text
/xsl:if
xsl:if test=$minLabelWidth
+   
xsl:textdisplay:block;float:/xsl:text
+   xsl:call-template 
name=getOppositeWritingDirection
+   xsl:with-param 
name=globalData select=$globalData/
+   xsl:with-param 
name=paraStyleName select=descendant-or-self::*/@text:style-name/
+   /xsl:call-template;

xsl:textmin-width:/xsl:text
xsl:call-template 
name=convert2cm
xsl:with-param 
name=value select=$minLabelWidth/
@@ -1963,7 +1968,20 @@

xsl:value-of select=$minLabelWidth/

/xsl:when

xsl:otherwise
+   
xsl:choose
+   
xsl:when test=$minLabelDist gt; 0

xsl:value-of select=$minLabelDist/
+   
/xsl:when
+   
xsl:otherwise
+   
xsl:variable name=listLevelLabelAlignment 
select=$listLevelStyle/style:list-level-properties/style:list-level-label-alignment/
+   
xsl:variable name=listLevelTextIndent
+   
xsl:call-template name=convert2cm
+   
xsl:with-param name=value 
select=string($listLevelLabelAlignment/@fo:text-indent)/
+   
/xsl:call-template
+   
/xsl:variable
+   
xsl:value-of select=-$listLevelTextIndent/
+   
/xsl:otherwise
+   
/xsl:choose

/xsl:otherwise

/xsl:choose

/xsl:variable
@@ -1986,7 +2004,7 @@

/xsl:call-template

xsl:text;min-width:/xsl:text

xsl:value-of select=$listLabelWidth/
-   
xsl:textcm/xsl:text
+   
xsl:textcm;/xsl:text

[Libreoffice-commits] .: filter/source

2012-11-23 Thread Libreoffice Gerrit user

 filter/source/svg/js2hxx.py |   18 ++
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit d7edcee5a954a34757f3ec4a694ce828a26aad81
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Nov 23 15:44:23 2012 +0200

Why write Emacs and vim mode lines to a generated file one should not edit?

Change-Id: I3f815bc7e825728421d5d87832f9a5ad1bcb53cc

diff --git a/filter/source/svg/js2hxx.py b/filter/source/svg/js2hxx.py
index 51d47dc..9c24fc4 100755
--- a/filter/source/svg/js2hxx.py
+++ b/filter/source/svg/js2hxx.py
@@ -144,25 +144,11 @@ if( not os.path.isfile( outfile_name ) ):
 
 
 # C++ header
-header_info = 
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+header_info = '/* !! This file is auto-generated, do not edit !! */'
 
-/* !! This file is auto-generated, do not edit !! */
-
-
-vim_setup = '/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
-
-outfile.write( header_info +'\n' )
-outfile.write( '\n' )
+outfile.write( header_info +'\n\n' )
 
 for line in out_lines:
 outfile.write( line + '\n' )
 
-outfile.write( '\n' )
-outfile.write( '\n' )
-outfile.write( vim_setup + '\n' )
-
 outfile.close()
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-23 Thread Libreoffice Gerrit user

 filter/source/svg/js2hxx.py |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4b8d8aeec472bd358f4e43e7fc6288644ce2d634
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Nov 23 15:55:56 2012 +0200

We prefix each line with four spaces, not append, but why?

Change-Id: Ia654664700b0b9262a5803d2976c22b61e44e758

diff --git a/filter/source/svg/js2hxx.py b/filter/source/svg/js2hxx.py
index 9c24fc4..39164b6 100755
--- a/filter/source/svg/js2hxx.py
+++ b/filter/source/svg/js2hxx.py
@@ -85,8 +85,7 @@ for line in in_lines:
 dline = dline.replace( 'ANIMDBG.on', 'ANIMDBG.off' )
 dline = dline.replace( 'DebugPrinter.on', 'DebugPrinter.off' )
 
-# append a 4 spaces indentation to each line
-escaped_line = ' %s' % dline
+escaped_line = '%s' % dline
 escaped_line = escaped_line.rstrip()
 
 # no more than 2 consecutive empty lines
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-23 Thread Libreoffice Gerrit user

 filter/source/svg/js2hxx.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e749c341042da1903f0dfe4d76803c9a5e950c5
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Nov 23 16:07:37 2012 +0200

Surely we can bin all indentation in the JavaScript

Change-Id: I8b889402345bd86c4a9ced62a22ad4137c673693

diff --git a/filter/source/svg/js2hxx.py b/filter/source/svg/js2hxx.py
index 39164b6..8aeb94c 100755
--- a/filter/source/svg/js2hxx.py
+++ b/filter/source/svg/js2hxx.py
@@ -86,7 +86,7 @@ for line in in_lines:
 dline = dline.replace( 'DebugPrinter.on', 'DebugPrinter.off' )
 
 escaped_line = '%s' % dline
-escaped_line = escaped_line.rstrip()
+escaped_line = escaped_line.rstrip().lstrip()
 
 # no more than 2 consecutive empty lines
 if( escaped_line == '' ):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-23 Thread Libreoffice Gerrit user

 filter/source/svg/svgfilter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 05bb624ca75f9960c7b5a5f8c02b4e7b011585e8
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Nov 23 21:12:39 2012 +0200

Try to get rid of the SVG export code when DISABLE_EXPORT

Change-Id: I89d226a8442558fbdff84de2115fa013c1690239

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index b5b4584..bbe2a3c 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -92,6 +92,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence 
PropertyValue  rDescripto
 
 if( mxDstDoc.is() )
 bRet = implImport( rDescriptor );
+#ifndef DISABLE_EXPORT
 else if( mxSrcDoc.is() )
 {
 if( !mbExportAll  !mSelectedPages.hasElements() )
@@ -233,6 +234,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence 
PropertyValue  rDescripto
 
 bRet = implExport( rDescriptor );
 }
+#endif
 else
 bRet = sal_False;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-22 Thread Libreoffice Gerrit user

 filter/source/msfilter/svdfppt.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit e36d227ee584aa07fa48dda7710ac6b7a850fcc3
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Nov 22 20:18:34 2012 +0530

n#782833: (PPT) Fix font size at end of para.

Font size at the end of the para when there is a
new(empty) line is set using an extra charprops definition.

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 9e0fbc0..c3b495a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5122,11 +5122,26 @@ void PPTStyleTextPropReader::Init( SvStream rIn, 
SdrPowerPointImport rMan, con
 
 PPTCharPropSet aCharPropSet( nCurrentPara );
 if ( bTextPropAtom )
+{
+if( nCharAnzRead == ( nStringLen - 1 )  aString.GetChar( 
nCharAnzRead ) == '\r' )
+{
+/* n#782833: Seems like the new line character at end of 
the para
+ * has two char properties and we would need to use the 
next one.
+ */
+PPTCharPropSet aDummyCharPropSet( nCurrentPara );
+ReadCharProps( rIn, aDummyCharPropSet, aString, 
nCharCount, nCharAnzRead,
+   bTextPropAtom, nExtParaPos, aStyleTextProp9, 
nExtParaFlags,
+   nBuBlip, nHasAnm, nAnmScheme );
+bEmptyParaPossible = true;
+}
 ReadCharProps( rIn, aCharPropSet, aString, nCharCount, 
nCharAnzRead,
bTextPropAtom, nExtParaPos, aStyleTextProp9, 
nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme );
+}
 else
+{
 nCharCount = nStringLen;
+}
 
 sal_uInt32 nLen;
 while( nCharCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-11-22 Thread Libreoffice Gerrit user

 filter/source/msfilter/svdfppt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 677f13f0e2567bcf667b016ef5e173766cc89cbf
Author: Michael Stahl mst...@redhat.com
Date:   Thu Nov 22 19:21:42 2012 +0100

PPTStyleTextPropReader::Init: -Werror=sign-compare

Change-Id: Ied7cfc6b1ab22d1af8a8d9e6a6c2eba77f90bcb6

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index c3b495a..208d8b5 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5113,7 +5113,7 @@ void PPTStyleTextPropReader::Init( SvStream rIn, 
SdrPowerPointImport rMan, con
 sal_uInt32 nCurrentPara = 0;
 size_t i = 1;   // points to the next element to 
process
 sal_uInt32 nCurrentSpecMarker = aSpecMarkerList.empty() ? 0 : 
aSpecMarkerList[0];
-sal_uInt16 nStringLen = aString.Len();
+sal_uInt32 nStringLen = aString.Len();
 
 while ( nCharAnzRead  nStringLen )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sc/qa sd/source svx/source sw/source tools/inc vcl/aqua vcl/ios vcl/source vcl/win vcl/workben

2012-11-20 Thread Libreoffice Gerrit user

 filter/source/flash/swfwriter1.cxx   |2 
 filter/source/flash/swfwriter2.cxx   |   18 ---
 filter/source/graphicfilter/epict/epict.cxx  |8 +--
 sc/qa/unit/ucalc.cxx |4 -
 sd/source/filter/eppt/pptx-text.cxx  |4 -
 sd/source/filter/html/htmlattr.cxx   |4 -
 sd/source/ui/animations/CustomAnimationList.cxx  |8 +--
 sd/source/ui/annotations/annotationmanager.cxx   |8 +--
 sd/source/ui/dlg/headerfooterdlg.cxx |8 +--
 sd/source/ui/slideshow/slideshowimpl.cxx |4 -
 sd/source/ui/unoidl/unomodel.cxx |2 
 sd/source/ui/view/frmview.cxx|   12 ++---
 svx/source/accessibility/ChildrenManagerImpl.cxx |8 +--
 svx/source/dialog/dlgctrl.cxx|   18 +++
 svx/source/svdraw/svddrgmt.cxx   |   10 ++--
 svx/source/table/cell.cxx|8 +--
 svx/source/table/svdotable.cxx   |4 -
 svx/source/table/tablelayouter.cxx   |   12 ++---
 svx/source/table/tablertfimporter.cxx|2 
 sw/source/core/access/accmap.cxx |   16 +++
 sw/source/core/bastyp/swrect.cxx |4 -
 sw/source/core/layout/paintfrm.cxx   |   52 +++
 sw/source/ui/uiview/viewport.cxx |   18 ---
 tools/inc/tools/gen.hxx  |   18 ---
 tools/inc/tools/vector2d.hxx |   14 +++---
 vcl/aqua/source/window/salframe.cxx  |8 +--
 vcl/aqua/source/window/salmenu.cxx   |2 
 vcl/ios/source/window/salframe.cxx   |8 +--
 vcl/source/control/button.cxx|2 
 vcl/source/control/imgctrl.cxx   |8 +--
 vcl/source/control/tabctrl.cxx   |   12 ++---
 vcl/source/gdi/outdev.cxx|6 +-
 vcl/source/gdi/outdev3.cxx   |8 +--
 vcl/source/gdi/pdfwriter_impl.cxx|8 +--
 vcl/source/window/brdwin.cxx |   14 +++---
 vcl/source/window/dockmgr.cxx|   36 ---
 vcl/source/window/splitwin.cxx   |8 +--
 vcl/source/window/syswin.cxx |8 +--
 vcl/source/window/window.cxx |   10 ++--
 vcl/win/source/window/salframe.cxx   |8 +--
 vcl/workben/vcldemo.cxx  |4 -
 41 files changed, 214 insertions(+), 202 deletions(-)

New commits:
commit 53ad646f54f8aa33b86c696c04500fd08ea6f3b6
Author: Matteo Casalin matteo.casa...@gmx.com
Date:   Sun Oct 28 23:23:53 2012 +0100

Enforce use of accessors on gen.hxx structures

Change-Id: Icd1b2937fdeaba6de1877258731f53ddf996002e
Reviewed-on: https://gerrit.libreoffice.org/936
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index cce56ee..3efc36c 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1162,7 +1162,7 @@ void Writer::Impl_writeLine( const Point rPt1, const 
Point rPt2, const Color*
 
 void Writer::Impl_writeRect( const Rectangle rRect, long nRadX, long nRadY )
 {
-if( (rRect.nTop == rRect.nBottom) || (rRect.nLeft == rRect.nRight) )
+if( (rRect.Top() == rRect.Bottom()) || (rRect.Left() == rRect.Right()) )
 {
 Color aColor( mpVDev-GetFillColor() );
 Impl_writeLine( rRect.TopLeft(), rRect.BottomRight(), aColor );
diff --git a/filter/source/flash/swfwriter2.cxx 
b/filter/source/flash/swfwriter2.cxx
index 4b4c7a5..b951064 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -252,23 +252,27 @@ void Tag::writeRect( SvStream rOut, const Rectangle 
rRect )
 
 sal_Int32 minX, minY, maxX, maxY;
 
-if( rRect.nLeft  rRect.nRight )
+if( rRect.Left()  rRect.Right() )
 {
-minX = rRect.nLeft; maxX = rRect.nRight;
+minX = rRect.Left();
+maxX = rRect.Right();
 }
 else
 {
-maxX = rRect.nLeft; minX = rRect.nRight;
+maxX = rRect.Left();
+minX = rRect.Right();
 }
 
 
-if( rRect.nTop  rRect.nBottom )
+if( rRect.Top()  rRect.Bottom() )
 {
-minY = rRect.nTop; maxY = rRect.nBottom;
+minY = rRect.Top();
+maxY = rRect.Bottom();
 }
 else
 {
-maxY = rRect.nTop; minY = rRect.nBottom;
+maxY = rRect.Top();
+minY = rRect.Bottom();
 }
 
 // AS: Figure out the maximum nubmer of bits required to represent any of 
the
@@ -665,7 +669,7 @@ void FillStyle::Impl_addGradient( Tag* pTag ) const
 case  GradientStyle_FORCE_EQUAL_SIZE: break;
 }
 
-m.translate( maBoundRect.nLeft, maBoundRect.nTop );
+m.translate( maBoundRect.Left(), maBoundRect.Top() );

[Libreoffice-commits] .: filter/source

2012-10-26 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/ipbm/ipbm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb3595dac6042c6fb5bb8823b2037aa2b0a3e7e0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Oct 26 15:04:10 2012 +0100

loplugin: misleading indent

Change-Id: I382b2a01ec5c7bbe5a3faf7333c161e8a76fdd27

diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx 
b/filter/source/graphicfilter/ipbm/ipbm.cxx
index abb28ef..6f5fcce 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -380,7 +380,7 @@ sal_Bool PBMReader::ImplReadBody()
 nCount--;
 if ( nGrey = mnMaxVal )
 nGrey = 255 * nGrey / mnMaxVal;
-mpAcc-SetPixel( nHeight, nWidth++, (sal_uInt8)nGrey );
+mpAcc-SetPixel( nHeight, nWidth++, (sal_uInt8)nGrey );
 nGrey = 0;
 if ( nWidth == mnWidth )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-16 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/idxf/dxftblrd.cxx |  208 --
 1 file changed, 131 insertions(+), 77 deletions(-)

New commits:
commit 1aba513f9092d5b61e9a1da3eb1b7f6c9c9055d2
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Oct 14 23:49:56 2012 -0500

coverty: misuses of strncpy

Change-Id: I13b3f176fc37b49e1bb7b191e97ef657eafaebe6
Reviewed-on: https://gerrit.libreoffice.org/876
Reviewed-by: David Ostrovsky david.ostrov...@gmx.de
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/filter/source/graphicfilter/idxf/dxftblrd.cxx 
b/filter/source/graphicfilter/idxf/dxftblrd.cxx
index 9448cec..f99de87 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.cxx
@@ -40,28 +40,42 @@ void DXFLType::Read(DXFGroupReader  rDGR)
 {
 switch (rDGR.GetG())
 {
-case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); 
break;
-case 70: nFlags=rDGR.GetI(); break;
-case  3: strncpy( sDescription, rDGR.GetS(), DXF_MAX_STRING_LEN + 
1 ); break;
-case 73:
-if (nDashIndex!=-1) {
-rDGR.SetError();
-return;
-}
-nDashCount=rDGR.GetI();
-if (nDashCountDXF_MAX_DASH_COUNT)
-nDashCount=DXF_MAX_DASH_COUNT;
-nDashIndex=0;
-break;
-case 40: fPatternLength=rDGR.GetF(); break;
-case 49:
-if (nDashCount==-1) {
-rDGR.SetError();
-return;
-}
-if (nDashIndexnDashCount)
-fDash[nDashIndex++]=rDGR.GetF();
-break;
+case  2:
+strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN );
+sName[DXF_MAX_STRING_LEN] = 0;
+break;
+case  3:
+strncpy( sDescription, rDGR.GetS(), DXF_MAX_STRING_LEN );
+sDescription[DXF_MAX_STRING_LEN] = 0;
+break;
+case 70:
+nFlags=rDGR.GetI();
+break;
+case 73:
+if (nDashIndex!=-1)
+{
+rDGR.SetError();
+return;
+}
+nDashCount=rDGR.GetI();
+if (nDashCountDXF_MAX_DASH_COUNT)
+{
+nDashCount=DXF_MAX_DASH_COUNT;
+}
+nDashIndex=0;
+break;
+case 40: fPatternLength=rDGR.GetF(); break;
+case 49:
+if (nDashCount==-1)
+{
+rDGR.SetError();
+return;
+}
+if (nDashIndexnDashCount)
+{
+fDash[nDashIndex++]=rDGR.GetF();
+}
+break;
 }
 }
 }
@@ -79,12 +93,24 @@ DXFLayer::DXFLayer()
 
 void DXFLayer::Read(DXFGroupReader  rDGR)
 {
-while (rDGR.Read()!=0) {
-switch(rDGR.GetG()) {
-case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); 
break;
-case 70: nFlags=rDGR.GetI(); break;
-case 62: nColor=rDGR.GetI(); break;
-case  6: strncpy( sLineType, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 
); break;
+while (rDGR.Read()!=0)
+{
+switch(rDGR.GetG())
+{
+case  2:
+strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN );
+sName[DXF_MAX_STRING_LEN] = 0;
+break;
+case  6:
+strncpy( sLineType, rDGR.GetS(), DXF_MAX_STRING_LEN );
+sLineType[DXF_MAX_STRING_LEN] = 0;
+break;
+case 70:
+nFlags=rDGR.GetI();
+break;
+case 62:
+nColor=rDGR.GetI();
+break;
 }
 }
 }
@@ -107,17 +133,40 @@ DXFStyle::DXFStyle()
 
 void DXFStyle::Read(DXFGroupReader  rDGR)
 {
-while (rDGR.Read()!=0) {
-switch(rDGR.GetG()) {
-case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); 
break;
-case 70: nFlags=rDGR.GetI(); break;
-case 40: fHeight=rDGR.GetF(); break;
-case 41: fWidthFak=rDGR.GetF(); break;
-case 50: fOblAngle=rDGR.GetF(); break;
-case 71: nTextGenFlags=rDGR.GetI(); break;
-case 42: fLastHeightUsed=rDGR.GetF(); break;
-case  3: strncpy( sPrimFontFile, rDGR.GetS(), DXF_MAX_STRING_LEN + 
1 ); break;
-case  4: strncpy( sBigFontFile, rDGR.GetS(), DXF_MAX_STRING_LEN + 
1 ); break;
+while (rDGR.Read()!=0)
+{
+switch(rDGR.GetG())
+{
+case  2:
+strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN );
+sName[DXF_MAX_STRING_LEN] = 0;
+break;
+case  3:
+strncpy( sPrimFontFile, rDGR.GetS(), DXF_MAX_STRING_LEN );
+

[Libreoffice-commits] .: filter/source

2012-10-14 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/itga/itga.cxx |   67 --
 1 file changed, 63 insertions(+), 4 deletions(-)

New commits:
commit 98ad35dc5ad0b603b46e0160f7fd4eed555e2a02
Author: Marc-AndrÃ© LaverdiÃ¨re marc-an...@atc.tcs.com
Date:   Fri Oct 12 10:58:16 2012 -0400

Added stream sanity checking to TGA filter

Change-Id: If6bb9f28e76ea012ac46b74e3cea0e27fd86741e
Reviewed-on: https://gerrit.libreoffice.org/864
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/filter/source/graphicfilter/itga/itga.cxx 
b/filter/source/graphicfilter/itga/itga.cxx
index 7a00af4..cd54971 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -123,10 +123,14 @@ TGAReader::TGAReader(SvStream rTGA)
 
 TGAReader::~TGAReader()
 {
-delete[] mpColorMap;
-delete mpFileHeader;
-delete mpExtension;
-delete mpFileFooter;
+if (mpColorMap != NULL)
+delete[] mpColorMap;
+if (mpFileHeader != NULL)
+delete mpFileHeader;
+if (mpExtension != NULL)
+delete mpExtension;
+if (mpFileFooter != NULL)
+delete mpFileFooter;
 }
 
 // 
---
@@ -182,6 +186,9 @@ sal_Bool TGAReader::ImplReadHeader()
 mpFileHeader-nColorMapXOrigin  mpFileHeader-nColorMapYOrigin 
 mpFileHeader-nImageWidth 
 mpFileHeader-nImageHeight  mpFileHeader-nPixelDepth  
mpFileHeader-nImageDescriptor;
 
+if ( !m_rTGA.good())
+return sal_False;
+
 if ( mpFileHeader-nColorMapType  1 )
 return sal_False;
 if ( mpFileHeader-nColorMapType == 1 )
@@ -200,6 +207,10 @@ sal_Bool TGAReader::ImplReadHeader()
 mpFileFooter-nSignature[0]  mpFileFooter-nSignature[1]  
mpFileFooter-nSignature[2] 
 mpFileFooter-nSignature[3]  mpFileFooter-nPadByte  
mpFileFooter-nStringTerminator;
 
+
+if ( !m_rTGA.good())
+return sal_False;
+
 // check for sal_True, VISI, ON-X, FILE in the signatures
 if ( mpFileFooter-nSignature[ 0 ] == 
(('T'24)|('R'16)|('U'8)|'E') 
  mpFileFooter-nSignature[ 1 ] == 
(('V'24)|('I'16)|('S'8)|'I') 
@@ -211,6 +222,8 @@ sal_Bool TGAReader::ImplReadHeader()
 {
 m_rTGA.Seek( mpFileFooter-nExtensionFileOffset );
 m_rTGA  mpExtension-nExtensionSize;
+if ( !m_rTGA.good())
+return sal_False;
 if ( mpExtension-nExtensionSize = SizeOfTGAExtension )
 {
 mnTGAVersion = 2;
@@ -228,6 +241,8 @@ sal_Bool TGAReader::ImplReadHeader()
  mpExtension-nPostageStampOffset  
mpExtension-nScanLineOffset
  mpExtension-nAttributesType;
 
+if ( !m_rTGA.good())
+return sal_False;
 }
 }
 }
@@ -309,6 +324,8 @@ sal_Bool TGAReader::ImplReadBody()
 while ( nYCount  mpFileHeader-nImageHeight )
 {
 m_rTGA  nRunCount;
+if ( !m_rTGA.good())
+return sal_False;
 if ( nRunCount  0x80 ) // a run length packet
 {
 m_rTGA  nRGB16;
@@ -317,6 +334,8 @@ sal_Bool TGAReader::ImplReadBody()
 nRed = (sal_uInt8)( mpColorMap[ nRGB16 ]  16 );
 nGreen = (sal_uInt8)( mpColorMap[ nRGB16 ]  8 );
 nBlue = (sal_uInt8)( mpColorMap[ nRGB16 ] );
+if ( !m_rTGA.good())
+return sal_False;
 for ( sal_uInt16 i = 0; i  ( ( nRunCount  0x7f ) 
+ 1 ); i++ )
 {
 mpAcc-SetPixel( nY, nX, BitmapColor( nRed, 
nGreen, nBlue ) );
@@ -339,11 +358,15 @@ sal_Bool TGAReader::ImplReadBody()
 for ( sal_uInt16 i = 0; i  ( ( nRunCount  0x7f ) 
+ 1 ); i++ )
 {
 m_rTGA  nRGB16;
+if ( !m_rTGA.good())
+return sal_False;
 if ( nRGB16 = mpFileHeader-nColorMapLength )
 return sal_False;
 nRed = (sal_uInt8)( mpColorMap[ nRGB16 ]  16 
);
 nGreen = (sal_uInt8)( mpColorMap[ nRGB16 ]  
8 );
 nBlue = (sal_uInt8)( mpColorMap[ nRGB16 ] );
+if ( !m_rTGA.good())
+return sal_False;
 mpAcc-SetPixel( nY, nX, BitmapColor( nRed, 
nGreen, nBlue )

[Libreoffice-commits] .: filter/source

2012-10-10 Thread Libreoffice Gerrit user

 filter/source/svg/svgwriter.cxx |   24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 1a969ab932a4d76eabdb867dbc267fece3429ef8
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 10 13:35:00 2012 +0200

SVGActionWriter::ImplWriteActions: fix debug code

Change-Id: I770e72673d794b4e3e52a199a05f018558b8a3c4

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ab7efe3..c80532b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2933,36 +2933,38 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile rMtf,
 {
 
 SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, desc, 
sal_False, sal_False );
-::rtl::OUString sType = ::rtl::OUString::valueOf( ( (sal_Int32) 
nType ) );
+OUStringBuffer sType;
+sType.append(static_castsal_Int32(nType));
 if( pAction  ( nType == META_COMMENT_ACTION ) )
 {
-sType += B2UCONST( :  );
+sType.append(: );
 const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
 rtl::OString sComment = pA-GetComment();
 if( !sComment.isEmpty() )
 {
 OUString ssComment = OUString( sComment.getStr(), 
sComment.getLength(), RTL_TEXTENCODING_UTF8 );
-sType += ssComment;
+sType.append(ssComment);
 }
 if( 
sComment.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(FIELD_SEQ_BEGIN)) )
 {
-const sal_uInt8* pData = NULL;
-pData = pA-GetData();
+sal_uInt8 const*const pData = pA-GetData();
 if( pData  ( pA-GetDataSize() ) )
 {
 sal_uInt16 sz = (sal_uInt16)( ( pA-GetDataSize() ) / 
2 );
 if( sz )
 {
-String sData( ( (const sal_Unicode*) pData ), sz );
-OUString ssData = OUString::valueOf( (sal_Int32) 
pA-GetDataSize() );
-sType += B2UCONST( ;  );
-sType += sData;
+sType.append(; );
+sType.append(
+reinterpret_castsal_Unicode const*(pData),
+sz);
 }
 }
 }
 }
-if( !sType.isEmpty() )
-mrExport.GetDocHandler()-characters( sType );
+if (sType.getLength())
+{
+
mrExport.GetDocHandler()-characters(sType.makeStringAndClear());
+}
 }
 catch( ... )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-10 Thread Libreoffice Gerrit user

 filter/source/svg/svgwriter.cxx |   61 
 1 file changed, 32 insertions(+), 29 deletions(-)

New commits:
commit bd4727567414d469896d7aaf7ee9a823c987e3d1
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 10 13:46:55 2012 +0200

SVGActionWriter::ImplWriteActions: indent that

Change-Id: I6ae6d96f88df813172017bafe1dd883c7b871c9e

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c80532b..2e7316b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2931,40 +2931,43 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile rMtf,
 {
 try
 {
-
-SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, desc, 
sal_False, sal_False );
-OUStringBuffer sType;
-sType.append(static_castsal_Int32(nType));
-if( pAction  ( nType == META_COMMENT_ACTION ) )
-{
-sType.append(: );
-const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
-rtl::OString sComment = pA-GetComment();
-if( !sComment.isEmpty() )
-{
-OUString ssComment = OUString( sComment.getStr(), 
sComment.getLength(), RTL_TEXTENCODING_UTF8 );
-sType.append(ssComment);
-}
-if( 
sComment.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(FIELD_SEQ_BEGIN)) )
-{
-sal_uInt8 const*const pData = pA-GetData();
-if( pData  ( pA-GetDataSize() ) )
+SvXMLElementExport aElem( mrExport,
+XML_NAMESPACE_NONE, desc, sal_False, sal_False );
+OUStringBuffer sType;
+sType.append(static_castsal_Int32(nType));
+if (pAction  (nType == META_COMMENT_ACTION))
+{
+sType.append(: );
+const MetaCommentAction* pA = (const MetaCommentAction*) 
pAction;
+rtl::OString sComment = pA-GetComment();
+if (!sComment.isEmpty())
+{
+OUString ssComment = OUString( sComment.getStr(),
+sComment.getLength(), RTL_TEXTENCODING_UTF8 );
+sType.append(ssComment);
+}
+if (sComment.equalsIgnoreAsciiCaseL(
+RTL_CONSTASCII_STRINGPARAM(FIELD_SEQ_BEGIN)))
 {
-sal_uInt16 sz = (sal_uInt16)( ( pA-GetDataSize() ) / 
2 );
-if( sz )
+sal_uInt8 const*const pData = pA-GetData();
+if (pData  (pA-GetDataSize()))
 {
-sType.append(; );
-sType.append(
-reinterpret_castsal_Unicode const*(pData),
-sz);
+sal_uInt16 sz = (sal_uInt16)((pA-GetDataSize()) / 
2);
+if (sz)
+{
+sType.append(; );
+sType.append(
+reinterpret_castsal_Unicode 
const*(pData),
+sz);
+}
 }
 }
 }
-}
-if (sType.getLength())
-{
-
mrExport.GetDocHandler()-characters(sType.makeStringAndClear());
-}
+if (sType.getLength())
+{
+mrExport.GetDocHandler()-characters(
+sType.makeStringAndClear());
+}
 }
 catch( ... )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-10 Thread Libreoffice Gerrit user

 filter/source/svg/svgexport.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 7d122d0cef4ecdeea0d11e619ec77aa7431344d9
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Oct 11 00:18:47 2012 +0200

Cleanup svg export namespace handling

All smil animations are inside the http://www.w3.org/2000/svg NS
for svg - ODF places e.g. animateMotion into smil, their path attr
though into svg. Flattened namespace now into only default (svg) and
the ooo prefix. Killed all superfluous NS decls, creating SvXMLExport
with EXPORT_META only adds XML_NP_XLINK, XML_NP_DC, XML_NP_META, and
XML_NP_GRDDL to the known-namespaces map.

Change-Id: Ib54900aaee0eda3a5c5dc618d836df8bd8eb25fc

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index d8f3a84..a0ff05b 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -330,12 +330,13 @@ SVGExport::SVGExport(
 const ::com::sun::star::uno::Reference 
::com::sun::star::lang::XMultiServiceFactory  xServiceFactory,
 const Reference XDocumentHandler  rxHandler,
 const Sequence PropertyValue  rFilterData )
-: SvXMLExport( util::MeasureUnit::MM_100TH, xServiceFactory )
+: SvXMLExport( util::MeasureUnit::MM_100TH,
+   xServiceFactory,
+   xmloff::token::XML_TOKEN_INVALID,
+   EXPORT_META|EXPORT_PRETTY )
 , mrFilterData( rFilterData )
 {
 SetDocHandler( rxHandler );
-sal_uInt16 nExportFlags = getExportFlags() | EXPORT_PRETTY;
-setExportFlags( nExportFlags );
 GetDocHandler()-startDocument();
 }
 
@@ -834,15 +835,9 @@ sal_Bool SVGFilter::implExportDocument()
 // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
 mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, stroke-width, 
OUString::valueOf( 28.222 ) );
 mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, stroke-linejoin, 
B2UCONST( round ) );
-mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:ooo, B2UCONST( 
http://xml.openoffice.org/svg/export; ) );
 mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns, B2UCONST( 
http://www.w3.org/2000/svg; ) );
+mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:ooo, B2UCONST( 
http://xml.openoffice.org/svg/export; ) );
 mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:xlink, B2UCONST( 
http://www.w3.org/1999/xlink; ) );
-
-mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:draw, B2UCONST( 
urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 ) );
-mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:presentation, 
B2UCONST( urn:oasis:names:tc:opendocument:xmlns:presentation:1.0 ) );
-mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:smil, B2UCONST( 
urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0 ) );
-mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xmlns:anim, B2UCONST( 
urn:oasis:names:tc:opendocument:xmlns:animation:1.0 ) );
-
 mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, xml:space, B2UCONST( 
preserve ) );
 
 mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, 
svg, sal_True, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-09 Thread Libreoffice Gerrit user

 filter/source/config/cache/filterfactory.cxx |   30 ---
 filter/source/msfilter/msdffimp.cxx  |8 ---
 filter/source/xsltdialog/xmlfileview.cxx |6 -
 3 files changed, 44 deletions(-)

New commits:
commit ad181973af9be0b5bea129ef9a1976b379681e66
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Oct 8 20:45:45 2012 -0300

Get ride of not used macros in filter

Change-Id: I7f06720c9f4614b763066bb3cf136f2464b2c7bd
Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/843
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/filter/source/config/cache/filterfactory.cxx 
b/filter/source/config/cache/filterfactory.cxx
index 931b3f2..fa918f6 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -35,20 +35,6 @@ namespace filter{
 namespace css = ::com::sun::star;
 
 
-/** @short  can be used to query for filters related to its application module.
- */
-#define BASE_QUERY_ALL  _query_all
-#define BASE_QUERY_WRITER   _query_Writer
-#define BASE_QUERY_WEB  _query_web
-#define BASE_QUERY_GLOBAL   _query_global
-#define BASE_QUERY_CHART_query_chart
-#define BASE_QUERY_CALC _query_calc
-#define BASE_QUERY_IMPRESS  _query_impress
-#define BASE_QUERY_DRAW _query_draw
-#define BASE_QUERY_MATH _query_math
-
-//___
-
 /** @short  define all possible parts of a filter query.
 
 @descr  syntax: query[:param[=value]]
@@ -64,22 +50,6 @@ namespace css = ::com::sun::star;
 default_first   set default filter on top of 
return listfalse
 case_sensitive  compare sort_prop case sensitive 
 false
  */
-#define SEPERATOR_QUERYPARAM((sal_Unicode)':')
-#define SEPERATOR_QUERYPARAMVALUE   ((sal_Unicode)'=')
-
-#define QUERYPARAM_IFLAGS   ::rtl::OUString( 
iflags )
-#define QUERYPARAM_EFLAGS   ::rtl::OUString( 
eflags )
-#define QUERYPARAM_SORT_PROP::rtl::OUString( 
sort_prop )
-
-#define QUERYPARAM_DESCENDING   ::rtl::OUString( 
descending )
-#define QUERYPARAM_USE_ORDER::rtl::OUString( 
use_order )
-#define QUERYPARAM_DEFAULT_FIRST::rtl::OUString( 
default_first )
-#define QUERYPARAM_CASE_SENSITIVE   ::rtl::OUString( 
case_sensitive )
-
-#define QUERYPARAMVALUE_SORT_PROP_NAME  ::rtl::OUString( 
name )
-#define QUERYPARAMVALUE_SORT_PROP_UINAME::rtl::OUString( 
uiname )
-
-
 
 FilterFactory::FilterFactory(const css::uno::Reference 
css::lang::XMultiServiceFactory  xSMGR)
 {
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index d1c6838..066c849 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -222,14 +222,6 @@ SvStream operator( SvStream rIn, DffRecordHeader rRec 
)
 return rIn;
 }
 
-// measurements  dashed lines
-#define LLEN_MIDDLE (450)
-#define LLEN_SPACE_MIDDLE   (360)
-#define LLEN_LONG   (LLEN_MIDDLE * 2)
-#define LLEN_SPACE_LONG (LLEN_SPACE_MIDDLE + 20)
-#define LLEN_POINT  (LLEN_MIDDLE / 4)
-#define LLEN_SPACE_POINT(LLEN_SPACE_MIDDLE / 4)
-
 SvStream operator( SvStream rIn, DffPropSet rRec )
 {
 rRec.InitializePropSet();
diff --git a/filter/source/xsltdialog/xmlfileview.cxx 
b/filter/source/xsltdialog/xmlfileview.cxx
index db3973d..9cf3522 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -55,12 +55,6 @@ using namespace com::sun::star::xml::sax;
 
 using ::rtl::OUString;
 
-
-#define MAX_SYNTAX_HIGHLIGHT 20
-#define MAX_HIGHLIGHTTIME 200
-#define SYNTAX_HIGHLIGHT_TIMEOUT 200
-
-
 struct SwTextPortion
 {
 sal_uInt16 nLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-01 Thread Libreoffice Gerrit user

 filter/source/textfilterdetect/fdcomp.cxx   |2 +-
 filter/source/textfilterdetect/textfd.component |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 256344d507dbcc22e1e371b8061ad5cfdf21cf98
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Oct 1 13:29:38 2012 +0300

Prefixify textfd

Change-Id: I42c9166dcf6d256d071a3edb20ab64184fef1f89

diff --git a/filter/source/textfilterdetect/fdcomp.cxx 
b/filter/source/textfilterdetect/fdcomp.cxx
index 6be78b3..85b9f3b 100644
--- a/filter/source/textfilterdetect/fdcomp.cxx
+++ b/filter/source/textfilterdetect/fdcomp.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::registry;
 
 extern C {
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textfd_component_getFactory(
 const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ 
)
 {
 void* pRet = NULL;
diff --git a/filter/source/textfilterdetect/textfd.component 
b/filter/source/textfilterdetect/textfd.component
index e1708e7..d2d333a 100644
--- a/filter/source/textfilterdetect/textfd.component
+++ b/filter/source/textfilterdetect/textfd.component
@@ -28,7 +28,7 @@
 * instead of those above.
 **--
 
-component loader=com.sun.star.loader.SharedLibrary
+component loader=com.sun.star.loader.SharedLibrary prefix=textfd
 xmlns=http://openoffice.org/2010/uno-components;
   implementation name=com.sun.star.comp.filters.PlainTextFilterDetect
 service name=com.sun.star.document.ExtendedTypeDetection/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-10-01 Thread Libreoffice Gerrit user

 filter/source/pdf/pdfexport.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 968ed85d7304fe0044d3f82af20ae7190ad3c33d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 1 15:42:13 2012 +0200

fdo#54225: PDFExport::mbSignPDF potentially used uninitialized

Change-Id: I2b83f4c6a1fd0ca4b230ab19c806f654232f9f96

diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 5b493ec..9ba6f41 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -152,7 +152,8 @@ PDFExport::PDFExport( const Reference XComponent  
rxSrcDoc,
 mbExportRelativeFsysLinks   ( sal_False ),
 mnDefaultLinkAction ( 0 ),
 mbConvertOOoTargetToPDFTarget( sal_False ),
-mbExportBmkToDest   ( sal_False )
+mbExportBmkToDest   ( sal_False ),
+mbSignPDF   ( false )
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-09-24 Thread Libreoffice Gerrit user

 filter/source/xmlfilterdetect/fdcomp.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit c6107b7d4901cfc120956ed9033279ec41f627b0
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Sep 24 09:58:55 2012 +0300

Use prefix in the DISABLE_DYNLOADING case

Change-Id: Ic110b66fc8f9e9ce812be3ea2d0672db4d223d39

diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx 
b/filter/source/xmlfilterdetect/fdcomp.cxx
index f20ff3a..b12cdb3 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -45,6 +45,10 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
+#ifdef DISABLE_DYNLOADING
+#define component_getFactory xmlfd_component_getFactory
+#endif
+
 extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-09-16 Thread Libreoffice Gerrit user

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8b950e8213c25212e6656a3e0da3ff6f470dcbfe
Author: Peter Jentsch pj...@guineapics.de
Date:   Mon Apr 30 16:52:31 2012 +0200

fix endless recursion with some characters in spreadsheetml headers/footers

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index de3d6e9..fe0a01e 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -7560,6 +7560,9 @@
xsl:with-param name=current-pos 
select=string-length($temp)+$current-pos+3/
/xsl:call-template
/xsl:when
+   xsl:when test=starts-with($current-style-data, 
'amp;')
+   xsl:value-of select=$current-pos + 1/
+   /xsl:when
xsl:otherwise
xsl:value-of select=$current-pos/
/xsl:otherwise
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-09-10 Thread Libreoffice Gerrit user

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |   46 +++---
 1 file changed, 18 insertions(+), 28 deletions(-)

New commits:
commit a2a10b59876951b6493419713e9054ceabd3d6cc
Author: Peter Jentsch pj...@guineapics.de
Date:   Tue May 1 00:09:39 2012 +0200

optimize font-decl template for libxslt (using exslt functions)

Change-Id: I5b8469db0729fdb722d22ae9a0a8688658db39f0

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 6258668..de3d6e9 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -25,7 +25,7 @@
   for a copy of the LGPLv3 License.
 
 --
-xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; 
xmlns:aml=http://schemas.microsoft.com/aml/2001/core; 
xmlns:dt=uuid:C2F41010-65B3-11d1-A29F-00AA00C14882 
xmlns:html=http://www.w3.org/TR/REC-html40; 
xmlns:o=urn:schemas-microsoft-com:office:office 
xmlns:ss=urn:schemas-microsoft-com:office:spreadsheet 
xmlns:SL=http://schemas.microsoft.com/schemaLibrary/2003/core; 
xmlns:v=urn:schemas-microsoft-com:vml 
xmlns:w10=urn:schemas-microsoft-com:office:word 
xmlns:w=http://schemas.microsoft.com/office/word/2003/wordml; 
xmlns:wx=http://schemas.microsoft.com/office/word/2003/auxHint; 
xmlns:x=urn:schemas-microsoft-com:office:excel 
xmlns:anim=urn:oasis:names:tc:opendocument:xmlns:animation:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:config=urn:oasis:names:tc:opendocument:xmlns:config:1.0 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:dr3d=urn:oasis:names:tc:opendocu
 ment:xmlns:dr3d:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:presentation=urn:oasis:names:tc:opendocument:xmlns:presentation:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:smil=urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:tabl
 e:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:xforms=http://www.w3.org/2002/xforms; 
xmlns:xlink=http://www.w3.org/1999/xlink; exclude-result-prefixes=aml dt html 
o ss SL v w10 w wx x
+xsl:stylesheet version=1.1 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; 
xmlns:aml=http://schemas.microsoft.com/aml/2001/core; 
xmlns:dt=uuid:C2F41010-65B3-11d1-A29F-00AA00C14882 
xmlns:html=http://www.w3.org/TR/REC-html40; 
xmlns:o=urn:schemas-microsoft-com:office:office 
xmlns:ss=urn:schemas-microsoft-com:office:spreadsheet 
xmlns:SL=http://schemas.microsoft.com/schemaLibrary/2003/core; 
xmlns:v=urn:schemas-microsoft-com:vml 
xmlns:w10=urn:schemas-microsoft-com:office:word 
xmlns:w=http://schemas.microsoft.com/office/word/2003/wordml; 
xmlns:wx=http://schemas.microsoft.com/office/word/2003/auxHint; 
xmlns:x=urn:schemas-microsoft-com:office:excel 
xmlns:anim=urn:oasis:names:tc:opendocument:xmlns:animation:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:config=urn:oasis:names:tc:opendocument:xmlns:config:1.0 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:dr3d=urn:oasis:names:tc:opendocu
 ment:xmlns:dr3d:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:presentation=urn:oasis:names:tc:opendocument:xmlns:presentation:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:smil=urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:tabl
 e:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0

[Libreoffice-commits] .: filter/source vcl/source

2012-08-27 Thread Libreoffice Gerrit user

 filter/source/pdf/impdialog.cxx|4 
 vcl/source/gdi/pdfwriter_impl2.cxx |3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 34091bc0e33a0aa6e839f5474e53d22a79960e68
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Aug 27 20:36:23 2012 +0100

drop these memory trashers

some are the wrong length anyway, and anyway the copies remain untrashed,
and munging immutable strings is dubious

Change-Id: Ic7ac3bea35e57ed015092b3b255d48819195490d

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8330730..d19c87e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1317,10 +1317,6 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, 
ClickmaPbSetPwdHdl)
 }
 else
 maPreparedOwnerPassword = Sequence NamedValue ();
-
-// trash clear text passwords string memory
-memset( (void*)aUserPW.getStr(), 0, aUserPW.getLength() );
-memset( (void*)aOwnerPW.getStr(), 0, aOwnerPW.getLength() );
 }
 enablePermissionControls();
 return 0;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 16f806b..1855d43 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1315,9 +1315,6 @@ void PDFWriterImpl::padPassword( const rtl::OUString 
i_rPassword, sal_uInt8* o_
 sal_Int32 i,y;
 for( i = nCurrentChar, y = 0 ; i  ENCRYPTED_PWD_SIZE; i++, y++ )
 o_pPaddedPW[i] = s_nPadString[y];
-
-// trash memory of temporary clear text password
-memset( (sal_Char*)aString.getStr(), 0, aString.getLength() );
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source officecfg/registry sfx2/source

2012-08-22 Thread Libreoffice Gerrit user

 filter/source/config/cache/constant.hxx
   |2 +-
 filter/source/config/cache/filtercache.cxx 
   |2 +-
 filter/source/config/fragments/filters/Text.xcu
   |2 +-
 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu   
   |2 +-
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
   |2 +-
 filter/source/config/fragments/filters/Text__encoded_.xcu  
   |2 +-
 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
 |2 +-
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 
   |2 +-
 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs  
   |2 +-
 sfx2/source/bastyp/fltfnc.cxx  
   |3 ++-
 10 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 45b03c888042052a47cb79bc5a2837d04e115c5e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Aug 22 09:46:57 2012 -0400

fdo#52451: Some name changes to be consistent with other prop names.

We use IMPORT EXPORT flags, so let's stick with the term 'Export' as
opposed to 'FileSave'.  Also, the file type's extensions are given
without the star-dot (*.), so let's strip that as well.

Change-Id: Ibde05058f7acb6ae149382009e78f3f10a71d543

diff --git a/filter/source/config/cache/constant.hxx 
b/filter/source/config/cache/constant.hxx
index 22d1074..7d27ffc 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -69,7 +69,7 @@
 #define  PROPNAME_USERDATA  UserData
 #define  PROPNAME_TEMPLATENAME  TemplateName
 #define  PROPNAME_FILEFORMATVERSION FileFormatVersion
-#define  PROPNAME_FILESAVEEXTENSION FileSaveExtension
+#define  PROPNAME_EXPORTEXTENSION   ExportExtension
 
 /** @short  used to identify a frame loader or detect service item
 property against the configuration API and can be used
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index 2a93c4f..e9dc2cf 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1834,7 +1834,7 @@ CacheItem FilterCache::impl_loadItem(const 
css::uno::Reference css::container::
 aItem[PROPNAME_UICOMPONENT  ] = 
xItem-getByName(PROPNAME_UICOMPONENT  );
 aItem[PROPNAME_FILTERSERVICE] = 
xItem-getByName(PROPNAME_FILTERSERVICE);
 aItem[PROPNAME_DOCUMENTSERVICE  ] = 
xItem-getByName(PROPNAME_DOCUMENTSERVICE  );
-aItem[PROPNAME_FILESAVEEXTENSION] = 
xItem-getByName(PROPNAME_FILESAVEEXTENSION);
+aItem[PROPNAME_EXPORTEXTENSION  ] = 
xItem-getByName(PROPNAME_EXPORTEXTENSION  );
 
 // special handling for flags! Convert it from a list of names 
to its
 // int representation ...
diff --git a/filter/source/config/fragments/filters/Text.xcu 
b/filter/source/config/fragments/filters/Text.xcu
index 0da24d7..4629f89 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -4,7 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
-prop oor:name=FileSaveExtensionvalue*.txt/value/prop
+prop oor:name=ExportExtensionvaluetxt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 
b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index bbc8392..0332e3e 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -4,7 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
-prop oor:name=FileSaveExtensionvalue*.txt/value/prop
+prop oor:name=ExportExtensionvaluetxt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.WebDocument/value/prop
diff --git 
a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index a866ff1..498057c 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -4,7 +4,7 @@
 prop

[Libreoffice-commits] .: filter/source

2012-08-21 Thread Libreoffice Gerrit user

 filter/source/msfilter/svdfppt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1bdccc596a220bbb05997c73875987841d79c07c
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Aug 21 18:35:17 2012 +0100

revert accidental breakage of object anchoring

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index e483b3e..2331468 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -592,6 +592,7 @@ void SdrEscherImport::ProcessClientAnchor2( SvStream rSt, 
DffRecordHeader rHd,
 {
 sal_Int16 ls, ts, rs, bs;
 rSt  ts  ls  rs  bs; // the order of coordinates is a bit 
strange...
+l = ls, t = ts, r = rs, b = bs;
 }
 Scale( l );
 Scale( t );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source officecfg/registry sfx2/source

2012-08-21 Thread Libreoffice Gerrit user

 filter/source/config/cache/constant.hxx|1 
 filter/source/config/cache/filtercache.cxx |1 
 filter/source/config/fragments/filters/Text.xcu|1 
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu |1 
 filter/source/config/fragments/filters/Text__encoded_.xcu  |1 
 officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs  |3 
++
 sfx2/source/bastyp/fltfnc.cxx  |   15 
--
 7 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit ba03f2dc817c692fa8709391ec83d8e01a0f8b28
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Aug 21 21:53:52 2012 -0400

fdo#52451: Ensure that the extension for text is .txt from writer.

Added a preferred extension property to the filter which overwrites
one(s) given by the default file format type associated with it.

Normally this property is not used for the majority of the filters,
but for plain text filters, we need to use .txt when saving from
writer whereas we do .csv from calc.

Change-Id: I3453ad084e4379e5cc1101daeb9d2c3ddd919e92

diff --git a/filter/source/config/cache/constant.hxx 
b/filter/source/config/cache/constant.hxx
index bd9d063..22d1074 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -69,6 +69,7 @@
 #define  PROPNAME_USERDATA  UserData
 #define  PROPNAME_TEMPLATENAME  TemplateName
 #define  PROPNAME_FILEFORMATVERSION FileFormatVersion
+#define  PROPNAME_FILESAVEEXTENSION FileSaveExtension
 
 /** @short  used to identify a frame loader or detect service item
 property against the configuration API and can be used
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index bab9201..2a93c4f 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1834,6 +1834,7 @@ CacheItem FilterCache::impl_loadItem(const 
css::uno::Reference css::container::
 aItem[PROPNAME_UICOMPONENT  ] = 
xItem-getByName(PROPNAME_UICOMPONENT  );
 aItem[PROPNAME_FILTERSERVICE] = 
xItem-getByName(PROPNAME_FILTERSERVICE);
 aItem[PROPNAME_DOCUMENTSERVICE  ] = 
xItem-getByName(PROPNAME_DOCUMENTSERVICE  );
+aItem[PROPNAME_FILESAVEEXTENSION] = 
xItem-getByName(PROPNAME_FILESAVEEXTENSION);
 
 // special handling for flags! Convert it from a list of names 
to its
 // int representation ...
diff --git a/filter/source/config/fragments/filters/Text.xcu 
b/filter/source/config/fragments/filters/Text.xcu
index 4a703d3..0da24d7 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.txt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop
diff --git 
a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 
b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index f15fe5a..a866ff1 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalue/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.csv/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.sheet.SpreadsheetDocument/value/prop
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu 
b/filter/source/config/fragments/filters/Text__encoded_.xcu
index a27c3c7..af51016 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT_DLG/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.txt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.TextDocument/value/prop
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs 
b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index f87846f..1de918a 100644
---

[Libreoffice-commits] .: filter/source

2012-08-21 Thread Libreoffice Gerrit user

 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu   
   |1 +
 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
 |1 +
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 
   |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 84d1ff7be178ec3572710e092e85fe548ce3042b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Aug 21 23:58:51 2012 -0400

fdo#52451: Use .txt extension for these guys too.

Change-Id: Ib5b405e147933f506aeadd69f90a9a8de99777dd

diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 
b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index 29ad18a..bbc8392 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.txt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.WebDocument/value/prop
diff --git 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
index d4fd201..d534352 100644
--- 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
+++ 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT_DLG/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.txt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.GlobalDocument/value/prop
diff --git 
a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 
b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
index b347977..895b9f2 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
@@ -4,6 +4,7 @@
 prop oor:name=FilterService/
 prop oor:name=UserDatavalueTEXT_DLG/value/prop
 prop oor:name=FileFormatVersionvalue0/value/prop
+prop oor:name=FileSaveExtensionvalue*.txt/value/prop
 prop oor:name=Typevaluegeneric_Text/value/prop
 prop oor:name=TemplateName/
 prop 
oor:name=DocumentServicevaluecom.sun.star.text.WebDocument/value/prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-08-20 Thread Libreoffice Gerrit user

 filter/source/pdf/impdialog.cxx |   56 +---
 filter/source/pdf/impdialog.hrc |   22 ---
 filter/source/pdf/impdialog.hxx |   10 ---
 filter/source/pdf/impdialog.src |   41 +++--
 4 files changed, 80 insertions(+), 49 deletions(-)

New commits:
commit 74ae4c44627068192eb0bda6c22367dd33cb0316
Author: GÃ¶kÃ§en Eraslan gokcen.eras...@gmail.com
Date:   Mon Aug 20 00:54:08 2012 +0200

Use Thunderbird-like certificate selection GUI in pdf signing.

Change-Id: Ibe834f1aecc60ba09a2c19d75b094881b82c248a
Reviewed-on: https://gerrit.libreoffice.org/431
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9f1bb2c..8330730 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -44,6 +44,7 @@
 #include com/sun/star/frame/XController.hpp
 #include com/sun/star/view/XSelectionSupplier.hpp
 #include com/sun/star/security/XDocumentDigitalSignatures.hpp
+#include com/sun/star/security/XCertificate.hpp
 
 #include boost/shared_ptr.hpp
 
@@ -1683,7 +1684,10 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage( Window* 
pParent,
   const SfxItemSet rCoreSet ) :
 SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_SIGNING ), rCoreSet ),
 
-maCbSignPDF( this, PDFFilterResId( CB_SIGN_PDF ) ),
+maFtSignCert( this, PDFFilterResId( FT_SIGN_CERT_TEXT ) ),
+maEdSignCert( this, PDFFilterResId( ED_SIGN_CERT ) ),
+maPbSignCertSelect( this, PDFFilterResId( BTN_SIGN_CERT_SELECT ) ),
+maPbSignCertClear( this, PDFFilterResId( BTN_SIGN_CERT_CLEAR ) ),
 maFtSignPassword( this, PDFFilterResId( FT_SIGN_PASSWORD ) ),
 maEdSignPassword( this, PDFFilterResId( ED_SIGN_PASSWORD ) ),
 maFtSignLocation( this, PDFFilterResId( FT_SIGN_LOCATION ) ),
@@ -1692,12 +1696,13 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage( Window* 
pParent,
 maEdSignContactInfo( this, PDFFilterResId( ED_SIGN_CONTACT ) ),
 maFtSignReason( this, PDFFilterResId( FT_SIGN_REASON ) ),
 maEdSignReason( this, PDFFilterResId( ED_SIGN_REASON ) ),
-maPbSignSelectCert( this, PDFFilterResId( BTN_SIGN_SELECT_CERT ) ),
 maSignCertificate()
 {
 FreeResource();
 
-maPbSignSelectCert.SetClickHdl( LINK( this, ImpPDFTabSigningPage, 
ClickmaPbSignSelectCert ) );
+maPbSignCertSelect.Enable( true );
+maPbSignCertSelect.SetClickHdl( LINK( this, ImpPDFTabSigningPage, 
ClickmaPbSignCertSelect ) );
+maPbSignCertClear.SetClickHdl( LINK( this, ImpPDFTabSigningPage, 
ClickmaPbSignCertClear ) );
 }
 
 // 
-
@@ -1705,7 +1710,7 @@ ImpPDFTabSigningPage::~ImpPDFTabSigningPage()
 {
 }
 
-IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignSelectCert )
+IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect )
 {
 
 uno::Sequence uno::Any  aArgs( 2 );
@@ -1722,6 +1727,29 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, 
ClickmaPbSignSelectCert )
 
 maSignCertificate = xSigner-chooseCertificate();
 
+if (maSignCertificate.is())
+{
+maEdSignCert.SetText(maSignCertificate-getSubjectName());
+maPbSignCertClear.Enable( true );
+maEdSignLocation.Enable( true );
+maEdSignPassword.Enable( true );
+maEdSignContactInfo.Enable( true );
+maEdSignReason.Enable( true );
+}
+
+return 0;
+}
+
+IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear )
+{
+maEdSignCert.SetText(OUString());
+maSignCertificate.clear();
+maPbSignCertClear.Enable( false );
+maEdSignLocation.Enable( false );
+maEdSignPassword.Enable( false );
+maEdSignContactInfo.Enable( false );
+maEdSignReason.Enable( false );
+
 return 0;
 }
 
@@ -1735,12 +1763,12 @@ SfxTabPage*  ImpPDFTabSigningPage::Create( Window* 
pParent,
 // 
-
 void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
-paParent-mbSignPDF = maCbSignPDF.IsChecked();
+paParent-mbSignPDF = maSignCertificate.is();
+paParent-maSignCertificate = maSignCertificate;
 paParent-msSignLocation = maEdSignLocation.GetText();
 paParent-msSignPassword = maEdSignPassword.GetText();
 paParent-msSignContact = maEdSignContactInfo.GetText();
 paParent-msSignReason = maEdSignReason.GetText();
-paParent-maSignCertificate = maSignCertificate;
 
 }
 
@@ -1748,16 +1776,14 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( 
ImpPDFTabDialog* paParent  )
 void ImpPDFTabSigningPage::SetFilterConfigItem( const  ImpPDFTabDialog* 
paParent )
 {
 
-maCbSignPDF.SetToggleHdl( LINK( this, ImpPDFTabSigningPage, 
ToggleSignPDFHdl ) );
 maEdSignLocation.Enable( false );
 maEdSignPassword.Enable( false );
 maEdSignContactInfo.Enable( false );

[Libreoffice-commits] .: filter/source

2012-08-20 Thread Libreoffice Gerrit user

 filter/source/pdf/impdialog.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f906ac27761332580b769f5f90d1f6bbd7f93701
Author: GÃ¶kÃ§en Eraslan gokcen.eras...@gmail.com
Date:   Mon Aug 20 19:46:15 2012 +0200

Use PassWord property in impdialog.src for certificate Edit widget.

Change-Id: I597de8efa8838b35597a401c27e1eb709fd8ef31

diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index cf6cfa1..353c53a 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -867,6 +867,7 @@ TabPage  RID_PDF_TAB_SIGNING
 {
 Border = TRUE ;
 Pos = MAP_APPFONT ( 102, 35 ) ;
+PassWord = TRUE;
 Size = MAP_APPFONT ( 68 , 12 ) ;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-08-19 Thread Libreoffice Gerrit user

 filter/source/graphicfilter/epict/epict.cxx |2 +-
 filter/source/msfilter/msdffimp.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef1fabb29d8b38da11c75384cec8979bfbc2dca4
Author: David Tardon dtar...@redhat.com
Date:   Sun Aug 19 07:31:26 2012 +0200

fix mangled comments breaking build

Change-Id: I4684ba6c30a2499093ceefeb096d9cfc3de76de9

diff --git a/filter/source/graphicfilter/epict/epict.cxx 
b/filter/source/graphicfilter/epict/epict.cxx
index 3ca6863..3efdacc 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -920,7 +920,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point  rPoint, 
const Size  rSize,
 // If 24-Bit, then create the Opcode 'DirectBitsRect':
 if ( nBitsPerPixel == 24 )
 {
-:Anzahl Bytes einer (ungepackten) Zeile in Quelle und Ziel berechnen:
+// Anzahl Bytes einer (ungepackten) Zeile in Quelle und Ziel berechnen:
 nSrcRowBytes =( ( 3 * nWidth ) + 0x0003 )  0xfffc;
 nDstRowBytes = nWidth * 4;
 
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 4f7ebcb..501d04b 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6470,7 +6470,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, 
Graphic rData, Rectangle* p
 
 // passende Info-Struct aus unserem Pointer Array nehmen
 SvxMSDffBLIPInfo rInfo = (*pBLIPInfos)[ nIdx-1 ];
-in the data streamim Daten Stream anspringen
+// das BLIP Atom im Daten Stream anspringen
 pStData-Seek( rInfo.nFilePos );
 // ggfs. Fehlerstatus zuruecksetzen
 if( pStData-GetError() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source oox/source sc/source

2012-08-09 Thread Noel Power

 filter/source/msfilter/eschesdo.cxx |   10 +-
 oox/source/export/vmlexport.cxx |   31 +--
 sc/source/filter/oox/commentsbuffer.cxx |3 +--
 sc/source/filter/xcl97/xcl97rec.cxx |   15 ++-
 4 files changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 56b0b2cbc0dc6538617e3f3b1005e4723ca227b0
Author: Noel Power noel.po...@novell.com
Date:   Thu Aug 9 11:15:43 2012 +0100

misc comment import/export fixes

a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added
support for shadow element with attributes, shadow color, shadow obscured )
b) use proper fillcolor attribute
c) detect whether note/comment is shown on import
d) export state of note ( shown/hidden )

text position still not perfect, we still are missing some attributes to 
control
that.

Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index bbd63d5..32d5680 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -208,7 +208,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 
 if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( IsFontwork ) ) 
 ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
-rObj.GetType().EqualsAscii( drawing.Measure ) || 
rObj.GetType().EqualsAscii( drawing.Caption ) )
+rObj.GetType().EqualsAscii( drawing.Measure ) )
 {
 rObj.SetType( String( RTL_CONSTASCII_STRINGPARAM(
 drawing.dontknow ),
@@ -614,6 +614,14 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( Bitmap ) ), sal_False ) )
 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
 }
+else if ( rObj.GetType().EqualsAscii( drawing.Caption ))
+{
+rObj.SetAngle( 0 );
+mpEscherEx-OpenContainer( ESCHER_SpContainer );
+ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );
+if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( 
RTL_CONSTASCII_USTRINGPARAM( MetaFile ) ), sal_False ) )
+aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
+}
 else if ( rObj.GetType().EqualsAscii( drawing.dontknow ))
 {
 rObj.SetAngle( 0 );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 34f0802..17ff426 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -516,7 +516,7 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 }
 
 if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) )
-impl_AddColor( pAttrList, XML_color, nValue );
+impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue 
);
 
 if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
 impl_AddColor( pAttrList, XML_color2, nValue );
@@ -634,7 +634,34 @@ void VMLExport::Commit( EscherPropertyContainer rProps, 
const Rectangle rRect
 break;
 
 case ESCHER_Prop_fHidden:
-m_pShapeStyle-append( ;visibility:hidden );
+if ( !it-nPropValue )
+m_pShapeStyle-append( ;visibility:hidden );
+break;
+case ESCHER_Prop_shadowColor:
+case ESCHER_Prop_fshadowObscured:
+{
+sal_uInt32 nValue = 0;
+bool bShadow = false;
+bool bObscured = false;
+if ( rProps.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) )
+{
+bShadow = (( nValue  0x20002 ) == 0x20002 );
+bObscured = (( nValue  0x10001 ) == 0x10001 );
+}
+if ( bShadow )
+{
+sax_fastparser::FastAttributeList *pAttrList = 
m_pSerializer-createAttrList();
+impl_AddBool( pAttrList, XML_on, bShadow );
+impl_AddBool( pAttrList, XML_obscured, bObscured );
+
+if ( rProps.GetOpt( ESCHER_Prop_shadowColor, nValue ) )
+impl_AddColor( pAttrList, XML_color, nValue );
+
+m_pSerializer-singleElementNS( XML_v, XML_shadow, 
XFastAttributeListRef( pAttrList ) );
+bAlreadyWritten[ ESCHER_Prop_fshadowObscured ] = true;
+bAlreadyWritten[ ESCHER_Prop_shadowColor ] = true;
+}
+}
 break;
 default:
 #if OSL_DEBUG_LEVEL  0
diff --git

[Libreoffice-commits] .: filter/source

2012-07-31 Thread Noel Power

 filter/source/msfilter/msdffimp.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 134028c6160de7d2c05f0ff67d71cbdb4bff4737
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Jul 16 09:28:37 2012 +0900

fdo#50269: bitmap area fill pattern reversed in LO3.5.x

this partially reverted 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d
in order to retain a hack for non-black background color

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index cd44fd9..c3c4139 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1723,8 +1723,17 @@ void DffPropertyReader::ApplyFillAttributes( SvStream 
rIn, SfxItemSet rSet, co
 aXOBitmap.Bitmap2Array();
 aXOBitmap.SetBitmapType( XBITMAP_8X8 );
 aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
-   aXOBitmap.SetPixelColor( aCol1 );
-   aXOBitmap.SetBackgroundColor( aCol2 );
+
+if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
+{
+aXOBitmap.SetPixelColor( aCol1 );
+aXOBitmap.SetBackgroundColor( aCol2 );
+}
+else
+{
+aXOBitmap.SetPixelColor( aCol2 );
+aXOBitmap.SetBackgroundColor( aCol1 );
+}
aXOBitmap.Array2Bitmap();
 }
 rSet.Put( XFillBitmapItem( rtl::OUString(), aXOBitmap 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-07-20 Thread Marco Cecchetti

 filter/source/svg/presentation_engine.js |  134 +--
 1 file changed, 110 insertions(+), 24 deletions(-)

New commits:
commit 6ee666c53da83982784ea59894479a8b93c8ecd7
Author: Horacio Fernandes horacio.fernan...@gmail.com
Date:   Fri Jul 20 10:07:15 2012 -0400

Support for the checkerboard transition animation in SVG export.

Ported the class CheckerBoardWipe.

Change-Id: I990c8f417c64d22ef87c1007887e630ac19a7083

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 88d8de0..186ef95 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -4217,6 +4217,7 @@ PINWHEELWIPE_TRANSITION = 6;  // 23
 PUSHWIPE_TRANSITION = 7; // 35
 SLIDEWIPE_TRANSITION= 8; // 36
 FADE_TRANSITION = 9; // 37
+CHECKERBOARDWIPE_TRANSITION = 10; // 39
 
 aTransitionTypeInMap = {
 'barWipe'   : BARWIPE_TRANSITION,
@@ -4227,12 +4228,13 @@ aTransitionTypeInMap = {
 'pinWheelWipe'  : PINWHEELWIPE_TRANSITION,
 'pushWipe'  : PUSHWIPE_TRANSITION,
 'slideWipe' : SLIDEWIPE_TRANSITION,
-'fade'  : FADE_TRANSITION
+'fade'  : FADE_TRANSITION,
+'checkerBoardWipe'  : CHECKERBOARDWIPE_TRANSITION
 };
 
 aTransitionTypeOutMap = [ '', 'barWipe', 'boxWipe', 'fourBoxWipe', 
'ellipseWipe',
   'clockWipe', 'pinWheelWipe', 'pushWipe', 'slideWipe',
-  'fade' ];
+  'fade', 'checkerBoardWipe' ];
 
 
 // Transition Subtypes
@@ -4243,25 +4245,27 @@ CORNERSIN_TRANS_SUBTYPE = 3; // 11
 CORNERSOUT_TRANS_SUBTYPE= 4;
 VERTICAL_TRANS_SUBTYPE  = 5;
 HORIZONTAL_TRANS_SUBTYPE= 6; // 14
-CIRCLE_TRANS_SUBTYPE= 7; // 27
-CLOCKWISETWELVE_TRANS_SUBTYPE   = 8; // 33
-CLOCKWISETHREE_TRANS_SUBTYPE= 9;
-CLOCKWISESIX_TRANS_SUBTYPE  = 10;
-CLOCKWISENINE_TRANS_SUBTYPE = 11;
-TWOBLADEVERTICAL_TRANS_SUBTYPE  = 12;
-TWOBLADEHORIZONTAL_TRANS_SUBTYPE= 13;
-FOURBLADE_TRANS_SUBTYPE = 14; // 39
-FROMLEFT_TRANS_SUBTYPE  = 15; // 97
-FROMTOP_TRANS_SUBTYPE   = 16;
-FROMRIGHT_TRANS_SUBTYPE = 17;
-FROMBOTTOM_TRANS_SUBTYPE= 18;
-CROSSFADE_TRANS_SUBTYPE = 19;
-FADETOCOLOR_TRANS_SUBTYPE   = 20;
-FADEFROMCOLOR_TRANS_SUBTYPE = 21;
-FADEOVERCOLOR_TRANS_SUBTYPE = 22;
-THREEBLADE_TRANS_SUBTYPE= 23;
-EIGHTBLADE_TRANS_SUBTYPE= 24;
-ONEBLADE_TRANS_SUBTYPE  = 25; // 107
+DOWN_TRANS_SUBTYPE  = 7  // 19
+CIRCLE_TRANS_SUBTYPE= 8; // 27
+CLOCKWISETWELVE_TRANS_SUBTYPE   = 9; // 33
+CLOCKWISETHREE_TRANS_SUBTYPE= 10;
+CLOCKWISESIX_TRANS_SUBTYPE  = 11;
+CLOCKWISENINE_TRANS_SUBTYPE = 12;
+TWOBLADEVERTICAL_TRANS_SUBTYPE  = 13;
+TWOBLADEHORIZONTAL_TRANS_SUBTYPE= 14;
+FOURBLADE_TRANS_SUBTYPE = 15; // 39
+FROMLEFT_TRANS_SUBTYPE  = 16; // 97
+FROMTOP_TRANS_SUBTYPE   = 17;
+FROMRIGHT_TRANS_SUBTYPE = 18;
+FROMBOTTOM_TRANS_SUBTYPE= 19;
+CROSSFADE_TRANS_SUBTYPE = 20;
+FADETOCOLOR_TRANS_SUBTYPE   = 21;
+FADEFROMCOLOR_TRANS_SUBTYPE = 22;
+FADEOVERCOLOR_TRANS_SUBTYPE = 23;
+THREEBLADE_TRANS_SUBTYPE= 24;
+EIGHTBLADE_TRANS_SUBTYPE= 25;
+ONEBLADE_TRANS_SUBTYPE  = 26; // 107
+ACROSS_TRANS_SUBTYPE= 27;
 
 aTransitionSubtypeInMap = {
 'leftToRight'   : LEFTTORIGHT_TRANS_SUBTYPE,
@@ -4270,6 +4274,7 @@ aTransitionSubtypeInMap = {
 'cornersOut': CORNERSOUT_TRANS_SUBTYPE,
 'vertical'  : VERTICAL_TRANS_SUBTYPE,
 'horizontal': HORIZONTAL_TRANS_SUBTYPE,
+'down'  : DOWN_TRANS_SUBTYPE,
 'circle': CIRCLE_TRANS_SUBTYPE,
 'clockwiseTwelve'   : CLOCKWISETWELVE_TRANS_SUBTYPE,
 'clockwiseThree': CLOCKWISETHREE_TRANS_SUBTYPE,
@@ -4288,16 +4293,18 @@ aTransitionSubtypeInMap = {
 'fadeOverColor' : FADEOVERCOLOR_TRANS_SUBTYPE,
 'threeBlade': THREEBLADE_TRANS_SUBTYPE,
 'eightBlade': EIGHTBLADE_TRANS_SUBTYPE,
-'oneBlade'  : ONEBLADE_TRANS_SUBTYPE
+'oneBlade'  : ONEBLADE_TRANS_SUBTYPE,
+'across': ACROSS_TRANS_SUBTYPE
 };
 
 aTransitionSubtypeOutMap = [ 'default', 'leftToRight', 'topToBottom', 
'cornersIn',
- 'cornersOut', 'vertical', 'horizontal', 'circle',
+ 'cornersOut', 'vertical', 'horizontal', 'down', 
'circle',
  'clockwiseTwelve', 'clockwiseThree', 
'clockwiseSix',
  'clockwiseNine', 'twoBladeVertical', 
'twoBladeHorizontal',
  'fourBlade', 'fromLeft', 'fromTop', 'fromRight',

[Libreoffice-commits] .: filter/source

2012-07-13 Thread Miklos Vajna

 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 28d3e647ada2876b7463993d305fa2e8c44dce48
Author: Gokul gokul.c...@gmail.com
Date:   Tue Jul 10 14:04:22 2012 +0300

Added ctrl+w for closing XML FILTER SETTING tool in DRAW

Change-Id: I37cee7027f674003ad4a600a4a36fc1a9eec2dc3

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 252c419..2e9e558 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1046,8 +1046,9 @@ long XMLFilterSettingsDialog::Notify( NotifyEvent rNEvt )
 const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
 KeyCode aKeyCode = pKEvt-GetKeyCode();
 sal_uInt16  nKeyCode = aKeyCode.GetCode();
+sal_BoolbMod1 =   pKEvt-GetKeyCode().IsMod1();
 
-if( nKeyCode == KEY_ESCAPE )
+if( nKeyCode == KEY_ESCAPE || (bMod1  (nKeyCode == KEY_W)))
 {
 Close();
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sot/source

2012-06-22 Thread Stephan Bergmann

 filter/source/svg/svgfilter.cxx  |   13 -
 filter/source/svg/svgfilter.hxx  |3 ---
 sot/source/sdstor/ucbstorage.cxx |1 -
 3 files changed, 17 deletions(-)

New commits:
commit 06395b802fe1cdc87a1b05dbeb65bb9cce724656
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Fri Jun 22 01:01:31 2012 +0200

cleanup of duplicated includes

  After commit ec5fa0164b9bae5c5bc6654f581e493206584301 replace all but 
one .hdl include with equivalent .hpp includes some of these includes were 
doubled in the corresponding files. This patch deletes those duplicates.

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 33697db..0187a90 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -35,30 +35,17 @@
 #include com/sun/star/drawing/XDrawView.hpp
 #include com/sun/star/frame/XDesktop.hpp
 #include com/sun/star/frame/XController.hpp
-
-
 #include com/sun/star/view/XSelectionSupplier.hpp
-#include com/sun/star/view/XSelectionSupplier.hpp
-#include com/sun/star/drawing/XDrawSubController.hpp
 #include com/sun/star/drawing/XDrawSubController.hpp
 #include com/sun/star/container/XNamed.hpp
-#include com/sun/star/container/XNamed.hpp
-#include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/drawing/framework/XControllerManager.hpp
-#include com/sun/star/drawing/framework/XControllerManager.hpp
 #include com/sun/star/drawing/framework/XConfigurationController.hpp
-#include com/sun/star/drawing/framework/XConfigurationController.hpp
-#include com/sun/star/drawing/framework/XResource.hpp
 #include com/sun/star/drawing/framework/XResource.hpp
 #include com/sun/star/drawing/framework/XView.hpp
-#include com/sun/star/drawing/framework/XView.hpp
 #include com/sun/star/drawing/framework/ResourceId.hpp
 #include comphelper/processfactory.hxx
 
-
-
-
 #include osl/mutex.hxx
 
 #include svgfilter.hxx
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 9660a77..fd47207 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -56,11 +56,8 @@
 #include com/sun/star/java/XJavaVM.hpp
 #include com/sun/star/java/XJavaThreadRegister_11.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
-#include com/sun/star/style/ParagraphAdjust.hpp
 #include com/sun/star/drawing/FillStyle.hpp
 #include com/sun/star/graphic/XGraphicProvider.hpp
-#include com/sun/star/graphic/XGraphicProvider.hpp
-
 
 #include boost/unordered_set.hpp
 #include boost/unordered_map.hpp
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 5554013..52a7898 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -60,7 +60,6 @@
 #include unotools/ucbhelper.hxx
 #include unotools/localfilehelper.hxx
 #include tools/urlobj.hxx
-#include unotools/streamwrap.hxx
 #include comphelper/processfactory.hxx
 #include cppuhelper/implbase2.hxx
 #include ucbhelper/commandenvironment.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source instsetoo_native/inc_openoffice officecfg/registry scp2/source setup_native/source solenv/bin

2012-06-21 Thread Andras Timar

 filter/source/config/fragments/types/draw_Visio_Document.xcu|2 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |8 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |5 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |1 
 officecfg/registry/data/org/openoffice/Office/UI.xcu|2 
 scp2/source/draw/module_draw.scp|9 +
 scp2/source/draw/registryitem_draw.scp  |6 
 scp2/source/draw/registryitem_draw.ulf  |5 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |   71 
+++---
 solenv/bin/modules/installer/windows/property.pm|2 
 11 files changed, 84 insertions(+), 29 deletions(-)

New commits:
commit ade85a43e1369cb9e0026f048ed410a964db48d9
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 21 17:28:58 2012 +0200

fdo#51274 optionally associate Visio file types (vsd/vst) to Draw

Change-Id: I0362d758205e7d12484e9e86ff2dce9608730c57

diff --git a/filter/source/config/fragments/types/draw_Visio_Document.xcu 
b/filter/source/config/fragments/types/draw_Visio_Document.xcu
index 17600d0..a271e2a 100644
--- a/filter/source/config/fragments/types/draw_Visio_Document.xcu
+++ b/filter/source/config/fragments/types/draw_Visio_Document.xcu
@@ -1,7 +1,7 @@
 node oor:name=draw_Visio_Document oor:op=replace 
 prop 
oor:name=DetectServicevaluecom.sun.star.comp.Draw.VisioImportFilter/value/prop
 prop oor:name=URLPattern/
-prop oor:name=Extensionsvaluevsd/value/prop
+prop oor:name=Extensionsvaluevsd vst/value/prop
 prop 
oor:name=MediaTypevalueapplication/vnd.visio/value/prop
 prop oor:name=Preferredvaluetrue/value/prop
 prop oor:name=PreferredFiltervalueVisio 
Document/value/prop
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 51f351b..d2a473b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -614,7 +614,7 @@ en-US = Microsoft Excel Spreadsheets
 en-US = Microsoft PowerPoint Presentations
 
 [OOO_CONTROL_273]
-en-US = [ProductName] Writer/Web
+en-US = Microsoft Visio Documents
 
 [OOO_CONTROL_274]
 en-US = Set [DEFINEDPRODUCT] to be the default application for Microsoft 
Office file types.
@@ -622,12 +622,6 @@ en-US = Set [DEFINEDPRODUCT] to be the default 
application for Microsoft Office
 [OOO_CONTROL_275]
 en-US = [ProductName] can be set as the default application to open Microsoft 
Office file types. This means, for instance, that if you double click on one of 
these files, [ProductName] will open it, not the program that opens it now.
 
-[OOO_CONTROL_276]
-en-US = File types
-
-[OOO_CONTROL_277]
-en-US = Default HTML editor
-
 [OOO_CONTROL_278]
 en-US = {MSSansBold8}File Type
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 5611333..2fbbad7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -128,11 +128,12 @@ FileTypeDialogBranding2   Text3   228 
88  13  65537   [ProductName]
 FileTypeDialog Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_138 CheckBox1   
 FileTypeDialog CheckBox1   CheckBox41  106 200 10  
3   SELECT_WORD  OOO_CONTROL_270CheckBox2   
 FileTypeDialog CheckBox2   CheckBox41  131 200 10  
3   SELECT_EXCEL OOO_CONTROL_271CheckBox3   
-FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272Back
+FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272CheckBox4   
+FileTypeDialog CheckBox4   CheckBox41  181 200 10  
3   SELECT_VISIO OOO_CONTROL_273Back
 FileTypeDialog DlgDesc Text21  20  272 25  65539   
OOO_CONTROL_274 
 FileTypeDialog DlgLine Line90  234 284 0   1   

 FileTypeDialog DlgText Text21  56  326 40  3   
OOO_CONTROL_275 
-FileTypeDialog DlgText2Text21  190 326 30  3   
OOO_CONTROL_309 
+FileTypeDialog DlgText2Text21  200 326 30  3   
OOO_CONTROL_309

[Libreoffice-commits] .: filter/source

2012-06-15 Thread Stephan Bergmann

 filter/source/svg/svgexport.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4ad231a6abea556ce7815fc6dafc9aebb87a4e26
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 15 13:19:57 2012 +0200

-Werror=unused-variable

Change-Id: Ic4c417667d45f80215303d2171b3c61d97284547

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index bcb2e29..f83fede 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -940,7 +940,6 @@ sal_Bool SVGFilter::implGenerateMetaData()
 sal_Bool bPageNumberVisibility= 
sal_False;// default: hidden
 sal_Bool bDateTimeVisibility  = 
sal_True; // default: visible
 sal_Bool bFooterVisibility= 
sal_True; // default: visible
-sal_Bool bHeaderVisibility= 
sal_True; // default: visible
 sal_Bool bDateTimeFixed   = 
sal_True; // default: fixed
 
 FixedDateTimeFieldaFixedDateTimeField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-06-14 Thread Julien Nabet

 filter/source/msfilter/escherex.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5af60dc534b9217e2c799aacbff03bdf727e806e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Jun 14 23:31:29 2012 +0200

Fix uninitialized values

Change-Id: I62b6cb30aeab40be18e5943a27ccd1d7130ad073

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 16459e5..9c76138 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1953,7 +1953,7 @@ sal_Int32 GetValueForEnhancedCustomShapeParameter( const 
com::sun::star::drawing
 sal_Int32 nValue = 0;
 if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
 {
-double fValue;
+double fValue(0.0);
 if ( rParameter.Value = fValue )
 nValue = (sal_Int32)fValue;
 }
@@ -1983,7 +1983,7 @@ sal_Bool GetValueForEnhancedCustomShapeHandleParameter( 
sal_Int32 nRetValue, co
 nRetValue = 0;
 if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
 {
-double fValue;
+double fValue(0.0);
 if ( rParameter.Value = fValue )
 nRetValue = (sal_Int32)fValue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sc/source starmath/source vcl/inc vcl/Package_inc.mk

2012-06-10 Thread Tor Lillqvist

 filter/source/graphicfilter/eps/eps.cxx   |2 -
 filter/source/graphicfilter/ieps/ieps.cxx |2 -
 sc/source/core/inc/core_pch.hxx   |1 
 sc/source/filter/inc/filt_pch.hxx |1 
 sc/source/ui/inc/ui_pch.hxx   |1 
 starmath/source/math_pch.cxx  |1 
 vcl/Package_inc.mk|1 
 vcl/inc/accel.h   |2 -
 vcl/inc/accmgr.hxx|2 -
 vcl/inc/brdwin.hxx|2 -
 vcl/inc/dbggui.hxx|2 -
 vcl/inc/generic/geninst.h |2 -
 vcl/inc/idlemgr.hxx   |2 -
 vcl/inc/ilstbox.hxx   |2 -
 vcl/inc/impbmp.hxx|2 -
 vcl/inc/jobset.h  |2 -
 vcl/inc/outdata.hxx   |2 -
 vcl/inc/print.h   |2 -
 vcl/inc/salframe.hxx  |2 -
 vcl/inc/salgdi.hxx|2 -
 vcl/inc/salinst.hxx   |2 -
 vcl/inc/salmenu.hxx   |2 -
 vcl/inc/salobj.hxx|2 -
 vcl/inc/salprn.hxx|2 -
 vcl/inc/salptype.hxx  |2 -
 vcl/inc/saltimer.hxx  |2 -
 vcl/inc/salvd.hxx |2 -
 vcl/inc/salwtype.hxx  |2 -
 vcl/inc/svdata.hxx|2 -
 vcl/inc/toolbox.h |2 -
 vcl/inc/unx/gtk/gtkobject.hxx |2 -
 vcl/inc/unx/salinst.h |2 -
 vcl/inc/unx/salmenu.h |2 -
 vcl/inc/unx/salobj.h  |2 -
 vcl/inc/unx/salstd.hxx|2 -
 vcl/inc/unx/x11/x11sys.hxx|2 -
 vcl/inc/vcl/accel.hxx |2 -
 vcl/inc/vcl/apptypes.hxx  |2 -
 vcl/inc/vcl/bitmap.hxx|2 -
 vcl/inc/vcl/bmpacc.hxx|2 -
 vcl/inc/vcl/btndlg.hxx|2 -
 vcl/inc/vcl/button.hxx|2 -
 vcl/inc/vcl/cmdevt.hxx|2 -
 vcl/inc/vcl/ctrl.hxx  |2 -
 vcl/inc/vcl/cursor.hxx|2 -
 vcl/inc/vcl/decoview.hxx  |2 -
 vcl/inc/vcl/dialog.hxx|2 -
 vcl/inc/vcl/dockingarea.hxx   |2 -
 vcl/inc/vcl/dockwin.hxx   |2 -
 vcl/inc/vcl/edit.hxx  |2 -
 vcl/inc/vcl/event.hxx |2 -
 vcl/inc/vcl/fixbrd.hxx|2 -
 vcl/inc/vcl/fixed.hxx |2 -
 vcl/inc/vcl/floatwin.hxx  |2 -
 vcl/inc/vcl/gfxlink.hxx   |2 -
 vcl/inc/vcl/graph.h   |2 -
 vcl/inc/vcl/graph.hxx |2 -
 vcl/inc/vcl/group.hxx |2 -
 vcl/inc/vcl/help.hxx  |2 -
 vcl/inc/vcl/image.hxx |2 -
 vcl/inc/vcl/inputctx.hxx  |2 -
 vcl/inc/vcl/introwin.hxx  |2 -
 vcl/inc/vcl/jobset.hxx|2 -
 vcl/inc/vcl/keycod.hxx|2 -
 vcl/inc/vcl/keycodes.hxx  |2 -
 vcl/inc/vcl/mapmod.hxx|2 -
 vcl/inc/vcl/menu.hxx  |2 -
 vcl/inc/vcl/menubtn.hxx   |2 -
 vcl/inc/vcl/morebtn.hxx   |2 -
 vcl/inc/vcl/msgbox.hxx|2 -
 vcl/inc/vcl/outdev.hxx|2 -
 vcl/inc/vcl/pointr.hxx|2 -
 vcl/inc/vcl/print.hxx |2 -
 vcl/inc/vcl/prntypes.hxx  |2 -
 vcl/inc/vcl/ptrstyle.hxx  |2 -
 vcl/inc/vcl/regband.hxx   |2 -
 vcl/inc/vcl/region.hxx|2 -
 vcl/inc/vcl/salbtype.hxx  |2 -
 vcl/inc/vcl/salgtype.hxx  |2 -
 vcl/inc/vcl/scrbar.hxx|2 -
 vcl/inc/vcl/settings.hxx  |2 -
 vcl/inc/vcl/slider.hxx|2 -
 vcl/inc/vcl/sndstyle.hxx  |2 -
 vcl/inc/vcl/spin.h|2 -
 vcl/inc/vcl/spin.hxx  |2 -
 vcl/inc/vcl/spinfld.hxx   |2 -
 vcl/inc/vcl/split.hxx |2 -
 vcl/inc/vcl/splitwin.hxx  |2 -
 vcl/inc/vcl/status.hxx|2 -
 vcl/inc/vcl/stdtext.hxx   |2 -
 vcl/inc/vcl/sv.h  |   36 --
 vcl/inc/vcl/svapp.hxx |2 -
 vcl/inc/vcl/symbol.hxx|2 -
 vcl/inc/vcl/syschild.hxx  |2 -
 vcl/inc/vcl/syswin.hxx|2 -
 vcl/inc/vcl/tabctrl.hxx

[Libreoffice-commits] .: filter/source

2012-06-08 Thread Julien Nabet

 filter/source/svg/svgexport.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3cf78fa315b84d866e643b93d0083b38bc8dab8c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Jun 9 01:06:57 2012 +0200

Check for assignment to self for =operator

Change-Id: If5c223e8b2f02938fa7e5d694d07f1e3f036c177

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index e73074a..c6611a8 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -428,6 +428,9 @@ ObjectRepresentation::~ObjectRepresentation()
 
 ObjectRepresentation ObjectRepresentation::operator=( const 
ObjectRepresentation rPresentation )
 {
+// Check for self-assignment
+if (this == rPresentation)
+return *this;
 mxObject = rPresentation.mxObject;
 delete mpMtf, ( mpMtf = rPresentation.mpMtf ? new GDIMetaFile( 
*rPresentation.mpMtf ) : NULL );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-06-05 Thread Kohei Yoshida

 filter/source/config/cache/typedetection.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eed0a0b26b9d61d26c888423c4e3d83b61728e3f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Jun 5 15:53:31 2012 -0400

Prioritize external filters over the internal ones.

Change-Id: I2407a2ebc01f39655b30f7eb1e65deb912f2e606

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 672a09f..c831935 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,9 @@ int getFlatTypeRank(const rtl::OUString rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.
-return -1;
+// Not ranked.  Treat them equally.  Unranked filters have higher priority
+// than the ranked internal ones since they may be external filters.
+return n;
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-06-05 Thread Kohei Yoshida

 filter/source/config/cache/typedetection.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20e9663e3342c8c619e404ae7f6392ce50a9dc89
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Jun 5 16:29:53 2012 -0400

Fix the description.

Change-Id: Ib30a77808b9f4726e72f57e9d9ea73c71f5cac34

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index c831935..49e5e24 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,8 @@ int getFlatTypeRank(const rtl::OUString rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.  Unranked filters have higher priority
-// than the ranked internal ones since they may be external filters.
+// Not ranked.  Treat them equally.  Unranked formats have higher priority
+// than the ranked internal ones since they may be defined externally.
 return n;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-30 Thread Kevin Hunter

 filter/source/msfilter/msdffimp.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ddc36f8914640d6d75464ab26690b72504469fa0
Author: Kevin Hunter hunt...@earlham.edu
Date:   Wed May 30 03:09:12 2012 -0400

cppcheck: Reduce variable scope

Change-Id: I11f7642346ccc1949d5716b32444df86541eabf8

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 9d5e1dc..b5c27bd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4326,15 +4326,14 @@ SdrObject* SvxMSDffManager::ImportGroup( const 
DffRecordHeader rHd, SvStream r
 rSt  aRecHd;
 if ( aRecHd.nRecType == DFF_msofbtSpContainer )
 {
-sal_Int32 nGroupRotateAngle = 0;
-sal_Int32 nSpFlags = 0;
 mnFix16Angle = 0;
 if (!aRecHd.SeekToBegOfRecord(rSt))
 return pRet;
 pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect, 
nCalledByGroup + 1, pShapeId );
 if ( pRet )
 {
-nSpFlags = nGroupShapeFlags;
+sal_Int32 nGroupRotateAngle = 0;
+sal_Int32 nSpFlags = nGroupShapeFlags;
 nGroupRotateAngle = mnFix16Angle;
 
 Rectangle aClientRect( rClientRect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sal/osl

2012-05-30 Thread Julien Nabet

 filter/source/graphicfilter/icgm/cgm.cxx |2 +-
 sal/osl/unx/file.cxx |2 --
 sal/osl/w32/file.cxx |2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e519306d498208484b72d935a3923af4a9adbbcb
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 30 20:54:37 2012 +0200

Some cppcheck cleaning

More information on this thread:

http://nabble.documentfoundation.org/Advice-needed-about-some-cppcheck-reports-td3986408.html

Change-Id: Ib70532ad72e8418e1036bd52c07dc6452508cd12

diff --git a/filter/source/graphicfilter/icgm/cgm.cxx 
b/filter/source/graphicfilter/icgm/cgm.cxx
index 8023fa7..3dd2ccc 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -266,7 +266,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, 
sal_uInt32 nRealSize )
 nRetValue += (double)nVal;
 if ( pLong[ nSwitch ]  0 )
 {
-nRetValue -= nRetValue;
+nRetValue = -nRetValue;
 }
 nRetValue /= 65536;
 }
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 1d8ab6c..3a5dac5 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1257,8 +1257,6 @@ SAL_CALL osl_mapFile (
 if (nSize  0)
 {
 c^= pData[0];
-pData += nSize;
-nSize = 0;
 }
 }
 }
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 341947f..70bca8b 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -876,8 +876,6 @@ SAL_CALL osl_mapFile(
 if (nSize  0)
 {
 c ^= pData[0];
-pData += nSize;
-nSize -= nSize;
 }
 }
 return osl_File_E_None;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-29 Thread Michael Meeks

 filter/source/svg/svgwriter.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8c55f7542b1be9dc11992e0942eaabc6688bfa3c
Author: Michael Meeks michael.me...@suse.com
Date:   Tue May 29 12:57:59 2012 +0100

targetted re-work

Change-Id: I64a38e22f776914605fe3903312524d8827e29a2

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 5bcbb5a..1106eaf 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -484,7 +484,7 @@ PolyPolygon SVGActionWriter::ImplMap( const PolyPolygon 
rPolyPoly, PolyPolygon
 for( long i = 0, nCount = rPolyPoly.Count(); i  nCount; i++ )
 {
 const Polygon  rPoly = rPolyPoly[ (sal_uInt16) i ];
-sal_uInt16  nSize = rPoly.GetSize();
+sal_uInt16 n = 1, nSize = rPoly.GetSize();
 
 if( nSize  1 )
 {
@@ -494,8 +494,6 @@ PolyPolygon SVGActionWriter::ImplMap( const PolyPolygon 
rPolyPoly, PolyPolygon
 aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() );
 
 sal_Char nCurrentMode = 0;
-sal_uInt16 n = 1;
-
 while( n  nSize )
 {
 aPathData += aBlank;
@@ -1201,9 +1199,10 @@ void SVGActionWriter::ImplWriteText( const Point rPos, 
const String rText,
 
 if( nWidth  aNormSize.Width()  ( nWidth != aNormSize.Width() ) 
)
 {
+long i;
 const double fFactor = (double) nWidth / aNormSize.Width();
 
-for( long i = 0; i  ( nLen - 1 ); i++ )
+for( i = 0; i  ( nLen - 1 ); i++ )
 pDX[ i ] = FRound( pDX[ i ] * fFactor );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-28 Thread Julien Nabet

 filter/source/msfilter/msdffimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0575c329b52071a993097cedc928944186750674
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon May 28 11:48:17 2012 +0200

Remove stray */

Change-Id: I550021c693c0971b952a708f51a0196cbe1fc8dc

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 4c10530..18c99bd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7424,7 +7424,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
 }
 //xInplaceObj-EnableSetModified( sal_False );
 xObj-setVisualAreaSize( nAspect, aAwtSz );
-//xInplaceObj-EnableSetModified( sal_True );*/
+//xInplaceObj-EnableSetModified( sal_True );
 }
 catch( const uno::Exception )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-28 Thread Julien Nabet

 filter/source/msfilter/msdffimp.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6b074ddd68133817b3aaff891fa85b43d264afe4
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon May 28 13:52:37 2012 +0200

Fix typos + fix prefer prefix++ for iter

Change-Id: Ic535667b3705fc707966e403edc32681a3c315e9

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 18c99bd..49ba211 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4601,7 +4601,7 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader rHd, SvStream r
 aSet.Put( SvxWeightItem( ( GetPropertyValue( 
DFF_Prop_gtextFStrikethrough, 0 )  0x0020 ) != 0 ? WEIGHT_BOLD : 
WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
 
 // SJ TODO: Vertical Writing is not correct, instead 
this should be
-// replaced through CharacterRotation by 90ï¿½, 
therefore a new Item has to be
+// replaced through CharacterRotation by 90Â°, 
therefore a new Item has to be
 // supported by svx core, api and xml file format
 ((SdrObjCustomShape*)pRet)-SetVerticalWriting( ( 
GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 )  0x2000 ) != 0 );
 
@@ -7275,9 +7275,9 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
 SvStream* pDataStrm,
 ErrCode rError,
 sal_uInt32 nConvertFlags,
-sal_Int64 nReccomendedAspect )
+sal_Int64 nRecommendedAspect )
 {
-sal_Int64 nAspect = nReccomendedAspect;
+sal_Int64 nAspect = nRecommendedAspect;
 SdrOle2Obj* pRet = 0;
 if( rSrcStorage.Is()  xDestStorage.is()  rStorageName.Len() )
 {
@@ -7625,7 +7625,7 @@ void SvxMSDffManager::removeShapeId( SdrObject* pShape )
 maShapeIdContainer.erase( aIter );
 break;
 }
-aIter++;
+++aIter;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-23 Thread Thorsten Behrens

 filter/source/msfilter/msdffimp.cxx |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

New commits:
commit b0932cb801db0dfdf6f1a0312683c7fc55eea443
Author: Pierre-AndrÃ© Jacquod pjacq...@alumni.ethz.ch
Date:   Thu May 17 17:51:33 2012 +0200

fdo#45779 avoiding creation of inconsistent B2DPolygon

this avoid the root cause of this bug, avoiding creating a
B2DPlygon which contains no points.

It seems the code relies somehow on an null B2DPolyPolygon, hence the
change done here. Better would be to have time to look how to remove
this fact. But currently it seems the code relies on  a
rSet.Put( XLineStartItem( aArrowName, aPolyPoly) where aPolyPoly is
not defined in certain cases.

Change-Id: I61b75d925090d1c9a0da96ce1a6eea50a2d60e5a

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 80785fa..5b6c86c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1099,12 +1099,13 @@ void SvxMSDffManager::SolveSolver( const 
SvxMSDffSolverContainer rSolver )
 
 

 
-static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const 
MSO_LineEnd eLineEnd,
+static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const 
MSO_LineEnd eLineEnd,
 const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLenght,
 sal_Int32 rnArrowWidth, sal_Bool rbArrowCenter,
 rtl::OUString rsArrowName, sal_Bool bScaleArrow )
 {
-basegfx::B2DPolygon aRetval;
+basegfx::B2DPolyPolygon aRetPolyPoly;
+
 double  fLineWidth = nLineWidth  70 ? 70.0 : nLineWidth;
 double  fLenghtMul, fWidthMul;
 sal_Int32   nLineNumber;
@@ -1140,7 +1141,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 
nLineWidth, const MSO_L
 aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, 
fLenghtMul * fLineWidth ));
 aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth 
));
 aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
 aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowEnd ));
 }
 break;
@@ -1169,7 +1170,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 
nLineWidth, const MSO_L
 aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.15, 
fLenghtMul * fLineWidth ));
 aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 
0.91 ));
 aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
 aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowOpenEnd 
));
 }
 break;
@@ -1181,7 +1182,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 
nLineWidth, const MSO_L
 aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 
, fLenghtMul * fLineWidth * 0.60 ));
 aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth 
));
 aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
 
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowStealthEnd ));
 }
 break;
@@ -1193,16 +1194,16 @@ static basegfx::B2DPolygon GetLineArrow( const 
sal_Int32 nLineWidth, const MSO_L
 aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 
, fLenghtMul * fLineWidth ));
 aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 
0.50 ));
 aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
 rbArrowCenter = sal_True;
 
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowDiamondEnd ));
 }
 break;
 case mso_lineArrowOvalEnd :
 {
-aRetval = XPolygon( Point( (sal_Int32)( fWidthMul * fLineWidth * 
0.50 ), 0 ),
+aRetPolyPoly = basegfx::B2DPolyPolygon( XPolygon( Point( 
(sal_Int32)( fWidthMul * fLineWidth * 0.50 ), 0 ),
 (sal_Int32)( fWidthMul * fLineWidth * 0.50 ),
-(sal_Int32)( fLenghtMul * fLineWidth * 
0.50 ), 0, 3600 ).getB2DPolygon();
+(sal_Int32)( fLenghtMul * fLineWidth * 
0.50 ), 0, 3600 ).getB2DPolygon() );
 rbArrowCenter = sal_True;
 aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowOvalEnd 
));
 }
@@ -1213,7 +1214,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 
nLineWidth, const MSO_L
 rsArrowName = aArrowName.makeStringAndClear();
 rnArrowWidth = (sal_Int32)( fLineWidth * fWidthMul );
 
-

[Libreoffice-commits] .: filter/source

2012-05-10 Thread Radek Doulík

 filter/source/msfilter/svdfppt.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit ea923cd424f6426d69a7fb375f5ac9e19ec2246a
Author: Radek Doulik r...@novell.com
Date:   Thu May 10 16:21:45 2012 +0200

use com::sun::star::table::BorderLine2 instead of older BorderLine 
(n#758914)

 - older BorderLine doesn't seem to work in case InnerLineWidth and 
OuterLineWidth are set to equal positive value and distance is set to 0 
(possible regression)
 - using the newer API solves the problem for us

Change-Id: I69f10a0e947352d20b78dbdc39b7c9af95f8603b

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index d61ab39..0501d4a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -120,7 +120,8 @@
 #include editeng/scripttypeitem.hxx
 #include com/sun/star/awt/Gradient.hpp
 #include com/sun/star/table/XMergeableCellRange.hpp
-#include com/sun/star/table/BorderLine.hpp
+#include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
 #include vcl/virdev.hxx
 #include algorithm
 #include set
@@ -7305,7 +7306,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, 
Reference XTable  xTabl
 {
 SfxItemSet aSet( pLine-GetMergedItemSet() );
 XLineStyle eLineStyle(((XLineStyleItem)pLine-GetMergedItem( 
XATTR_LINESTYLE )).GetValue());
-com::sun::star::table::BorderLine aBorderLine;
+com::sun::star::table::BorderLine2 aBorderLine;
 switch( eLineStyle )
 {
 case XLINE_DASH :
@@ -7313,16 +7314,14 @@ void ApplyCellLineAttributes( const SdrObject* pLine, 
Reference XTable  xTabl
 {
 Color aLineColor( ((XLineColorItem)pLine-GetMergedItem( 
XATTR_LINECOLOR )).GetColorValue() );
 aBorderLine.Color = aLineColor.GetColor();
-aBorderLine.OuterLineWidth = static_cast sal_Int16 ( 
((const XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 
);
-aBorderLine.InnerLineWidth = static_cast sal_Int16 ( 
((const XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 
);
-aBorderLine.LineDistance = 0;
+aBorderLine.LineWidth = static_cast sal_Int16 ( ((const 
XLineWidthItem)(pLine-GetMergedItem(XATTR_LINEWIDTH))).GetValue() / 4 );
+aBorderLine.LineStyle = eLineStyle == XLINE_SOLID ? 
table::BorderLineStyle::SOLID : table::BorderLineStyle::DASHED;
 }
 break;
 case XLINE_NONE :
 {
-aBorderLine.OuterLineWidth = 0;
-aBorderLine.InnerLineWidth = 0;
-aBorderLine.LineDistance = 0;
+aBorderLine.LineWidth = 0;
+aBorderLine.LineStyle = table::BorderLineStyle::NONE;
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-05-08 Thread Michael Stahl

 filter/source/svg/svgreader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2580fcb655e55e2e482524ccd5a84e13377b824b
Author: Michael Stahl mst...@redhat.com
Date:   Tue May 8 11:59:45 2012 +0200

svgreader.cxx: fix -Werror=sign-promo

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 5386f3c..36e3dd5 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -135,7 +135,7 @@ templatetypename Func void visitChildren(const Func 
rFunc,
 const sal_Int32 nNumNodes( xChildren-getLength() );
 for( sal_Int32 i=0; inNumNodes; ++i )
 {
-SAL_INFO(svg, node type:   xChildren-item(i)-getNodeType()  
 tag name   xChildren-item(i)-getNodeName()   value |  
xChildren-item(i)-getNodeValue()  |);
+SAL_INFO(svg, node type:   
sal::static_int_castsal_uInt32(xChildren-item(i)-getNodeType())   tag 
name   xChildren-item(i)-getNodeName()   value |  
xChildren-item(i)-getNodeValue()  |);
 if( xChildren-item(i)-getNodeType() == eChildType )
 rFunc( *xChildren-item(i).get() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-04-30 Thread Fridrich Strba

 filter/source/svg/gfxtypes.hxx  |8 ++--
 filter/source/svg/svgreader.cxx |7 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit b18cfdc7cd3755c147970f86d23973f337be01a7
Author: Chr. Rossmanith chr.rossman...@gmx.de
Date:   Sun Apr 29 22:12:29 2012 +0200

SVG: text elements and graphic elements should not share style ids

diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index 24c4cbd..daca2be 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -173,10 +173,11 @@ struct State
 maTransform(),
 maViewport(),
 maViewBox(),
+mbIsText(false),
 maFontFamily(), // app-default
 mnFontSize(0),
-maFontStyle(RTL_CONSTASCII_USTRINGPARAM(normal)),
-maFontVariant(RTL_CONSTASCII_USTRINGPARAM(normal)),
+maFontStyle(normal),
+maFontVariant(normal),
 mnFontWeight(400.0),
 meTextAnchor(BEFORE),
 meTextDisplayAlign(BEFORE),
@@ -211,6 +212,7 @@ struct State
 basegfx::B2DRange   maViewport;
 basegfx::B2DRange   maViewBox;
 
+boolmbIsText;
 rtl::OUString   maFontFamily;
 /** Absolute: xx-small=6.94 | x-small=8.33 | small=10 | medium=12 | 
large=14.4 | x-large=17.28 | xx-large=20.736
 
@@ -263,6 +265,7 @@ inline bool operator==(const State rLHS, const State rRHS 
)
 rLHS.maTransform==rRHS.maTransform 
 rLHS.maViewport==rRHS.maViewport 
 rLHS.maViewBox==rRHS.maViewBox 
+rLHS.mbIsText==rRHS.mbIsText 
 rLHS.maFontFamily==rRHS.maFontFamily 
 rLHS.mnFontSize==rRHS.mnFontSize 
 rLHS.maFontStyle==rRHS.maFontStyle 
@@ -309,6 +312,7 @@ struct StateHash
 ^  size_t(rState.maViewport.getHeight())
 ^  size_t(rState.maViewBox.getWidth())
 ^  size_t(rState.maViewBox.getHeight())
+^  size_t(rState.mbIsText)
 ^  size_t(rState.maFontFamily.hashCode())
 ^  size_t(rState.mnFontSize)
 ^  size_t(rState.maFontStyle.hashCode())
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index dfb33c8..2c0c09b 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -521,8 +521,12 @@ struct AnnotatingVisitor
 rtl::ReferenceSvXMLAttributeList xAttrs( new SvXMLAttributeList() );
 uno::Referencexml::sax::XAttributeList xUnoAttrs( xAttrs.get() );
 
+if (XML_TEXT == nTagId)
+rState.mbIsText = true;
 std::pairStatePool::iterator,
   bool aRes = mrStates.insert(rState);
+SAL_INFO (svg, size   mrStates.size() id
const_castState(*aRes.first).mnStyleId);
+
 if( !aRes.second )
 return false; // not written
 
@@ -530,6 +534,8 @@ struct AnnotatingVisitor
 
 // mnStyleId does not take part in hashing/comparison
 const_castState(*aRes.first).mnStyleId = mnCurrStateId;
+SAL_INFO (svg,  --
const_castState(*aRes.first).mnStyleId);
+
 mrStateMap.insert(std::make_pair(
   mnCurrStateId,
   rState));
@@ -750,6 +756,7 @@ struct AnnotatingVisitor
 
 void writeStyle(const uno::Referencexml::dom::XElement xElem, const 
sal_Int32 nTagId)
 {
+SAL_INFO (svg, writeStyle xElem   xElem-getTagName());
 sal_Int32 nEmulatedStyleId=0;
 if( maCurrState.maDashArray.size() 
 maCurrState.meStrokeType != NONE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-04-30 Thread Caolán McNamara

 filter/source/config/tools/merge/pyAltFCFGMerge |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 888d2d8d5ef599bafedd4f9ffdd2dc9d48b6a2cb
Author: Noel Grandin noelgran...@gmail.com
Date:   Sun Apr 29 15:25:47 2012 +0200

Fix location of env binary to work on MacOSX

diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge 
b/filter/source/config/tools/merge/pyAltFCFGMerge
index 3954ef7..dfebbec 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 #_
 # Caolan McNamara caol...@redhat.com
 # converted from original java written by Andreas Schluens so we can continue
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-04-29 Thread Julien Nabet

 filter/source/flash/swfwriter.cxx  |3 +--
 filter/source/flash/swfwriter1.cxx |4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit b6aeba0de214b8331134aad25717c1cfae271a48
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 29 16:46:56 2012 +0200

Prefix ++/-- operators for non-primitive types

Change-Id: Ie64f5393fb285431401bf3c19fc4c25c7085dd04

diff --git a/filter/source/flash/swfwriter.cxx 
b/filter/source/flash/swfwriter.cxx
index d7b2076..1d4704b 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -364,10 +364,9 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile rMtf, 
sal_Int16 x, sal_Int16
 nId = startSprite();
 
 sal_uInt16 iDepth = 1;
-while( aIter != aEnd )
+for(; aIter != aEnd; ++aIter)
 {
 placeShape( *aIter, iDepth++, x, y );
-aIter++;
 }
 
 endSprite();
diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index 3f20b6c..d43569e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -407,15 +407,13 @@ FlashFont Writer::Impl_getFont( const Font rFont )
 FontMap::iterator aIter( maFonts.begin() );
 const FontMap::iterator aEnd( maFonts.end() );
 
-while( aIter != aEnd )
+for(; aIter != aEnd; ++aIter)
 {
 const Font tempFont = (*aIter)-getFont();
 if( compare_fonts_for_me(tempFont, rFont) )
 {
 return **aIter;
 }
-
-aIter++;
 }
 
 FlashFont* pFont = new FlashFont( rFont, createID() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sw/qa

2012-04-25 Thread Miklos Vajna

 filter/source/msfilter/util.cxx   |2 ++
 sw/qa/extras/rtftok/data/fdo44211.rtf |4 
 sw/qa/extras/rtftok/rtftok.cxx|   25 -
 3 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit a8c05ae840f2673803d9784600be9a7b734076fc
Author: Aurimas FiÅ¡eras auri...@members.fsf.org
Date:   Sat Apr 21 23:01:09 2012 +0300

fdo#44211 (RTF) return default text encoding for Lithuanian

diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 62edc7f..76fe07c 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -46,6 +46,8 @@ rtl_TextEncoding getBestTextEncodingFromLocale(const 
::com::sun::star::lang::Loc
 return RTL_TEXTENCODING_MS_1253;
 if (rLanguage == tr)
 return RTL_TEXTENCODING_MS_1254;
+if (rLanguage == lt)
+return RTL_TEXTENCODING_MS_1257;
 return RTL_TEXTENCODING_MS_1252;
 }
 
diff --git a/sw/qa/extras/rtftok/data/fdo44211.rtf 
b/sw/qa/extras/rtftok/data/fdo44211.rtf
new file mode 100644
index 000..699ce73
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo44211.rtf
@@ -0,0 +1,4 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 Helvetica;}}
+\pard\f0\fs20\'e0\'e8\'e6
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 48e33e2..e416889 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -87,6 +87,7 @@ public:
 void testFdo48023();
 void testFdo48876();
 void testFdo48193();
+void testFdo44211();
 
 CPPUNIT_TEST_SUITE(RtfModelTest);
 #if !defined(MACOSX)  !defined(WNT)
@@ -113,7 +114,7 @@ public:
 CPPUNIT_TEST(testFdo48356);
 CPPUNIT_TEST(testFdo48023);
 CPPUNIT_TEST(testFdo48876);
-CPPUNIT_TEST(testFdo48193);
+CPPUNIT_TEST(testFdo44211);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -624,6 +625,28 @@ void RtfModelTest::testFdo48193()
 CPPUNIT_ASSERT_EQUAL(7, getLength());
 }
 
+void RtfModelTest::testFdo44211()
+{
+lang::Locale aLocale;
+aLocale.Language = lt;
+AllSettings aSettings(Application::GetSettings());
+AllSettings aSavedSettings(aSettings);
+aSettings.SetLocale(aLocale);
+Application::SetSettings(aSettings);
+load(fdo44211.rtf);
+Application::SetSettings(aSavedSettings);
+
+uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess 
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum = 
xParaEnumAccess-createEnumeration();
+uno::Referencecontainer::XEnumerationAccess 
xRangeEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRangeEnum = 
xRangeEnumAccess-createEnumeration();
+uno::Referencetext::XTextRange xTextRange(xRangeEnum-nextElement(), 
uno::UNO_QUERY);
+
+OUString aExpected(ÄÄÄ, 6, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-04-03 Thread Fridrich Strba

 filter/source/svg/parserfragments.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 333cb00a6399bcafa0248a64922757da4a7d
Author: Christina Rossmanith chrrossman...@web.de
Date:   Sun Apr 1 21:14:10 2012 +0200

SVG: treat skewX and skewY correct

diff --git a/filter/source/svg/parserfragments.cxx 
b/filter/source/svg/parserfragments.cxx
index d70eaad..3de3d4b 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -93,16 +93,16 @@ void calcRotation(std::vectorgeometry::AffineMatrix2D 
rTransforms,
 void calcSkewX(std::vectorgeometry::AffineMatrix2D rTransforms,
double fSkewAngle)
 {
-geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
-  tan(fSkewAngle*M_PI/180),1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
+  0.0,1.0,0.0);
 rTransforms.push_back(aMat);
 }
 
 void calcSkewY(std::vectorgeometry::AffineMatrix2D rTransforms,
double fSkewAngle)
 {
-geometry::AffineMatrix2D aMat(1.0,tan(fSkewAngle*M_PI/180),0.0,
-  0.0,1.0,0.0);
+geometry::AffineMatrix2D aMat(1.0,0.0,0.0,
+  tan(fSkewAngle*M_PI/180),1.0,0.0);
 rTransforms.push_back(aMat);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-03-21 Thread Fridrich Strba

 filter/source/svg/svgreader.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 11ccf88eeb8e4148ca532e3a42ddca356ebde811
Author: Christina Rossmanith chrrossman...@web.de
Date:   Sat Mar 17 22:06:22 2012 +0100

SVG import: keep aspect ratio when transforming viewbox to viewport

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 5d46c7c..cd5da23 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -293,12 +293,13 @@ struct AnnotatingVisitor
 maCurrState.maViewBox.getWidth() != 0.0 
 maCurrState.maViewBox.getHeight() != 0.0 )
 {
-// transform aViewBox into viewport, such that they
-// coincide
+// transform aViewBox into viewport, keep aspect ratio
 aLocalTransform.translate(-maCurrState.maViewBox.getMinX(),
   
-maCurrState.maViewBox.getMinY());
-
aLocalTransform.scale(maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth(),
-  
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight());
+double scaleW = 
maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth();
+double scaleH = 
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight();
+double scale = (scaleW  scaleH) ? scaleW : scaleH;
+aLocalTransform.scale(scale,scale);
 }
 maCurrState.maCTM = 
maCurrState.maCTM*maCurrState.maTransform*aLocalTransform;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-03-15 Thread Lubos Lunak

 filter/source/graphicfilter/icgm/bitmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3297ce2aa13efc6029983b716cec20ed7befda56
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Mar 16 03:24:22 2012 +0100

0x8001 can't fit into (signed) long

As far as I can say, this value and all those negative values
are actually not valid in CGM anyway, but since I do not know
the code, I'm leaving them in, they shouldn't break anything.

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index d614443..bc84135 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -256,7 +256,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor 
rDesc )
 rDesc.mnScanSize = 0;
 switch( rDesc.mnLocalColorPrecision )
 {
-case 0x8001 :   // monochrome ( bit = 
0-backgroundcolor )
+case long(0x8001) : // monochrome ( bit = 
0-backgroundcolor )
 case 0 ://  bit = 
1-fillcolor
 rDesc.mnDstBitsPerPixel = 1;
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-03-07 Thread Marco Cecchetti

 filter/source/svg/presentation_engine.js |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9fb6c48b8573283aa6653825e244f59e6a34cec2
Author: Marco Cecchetti mrcek...@gmail.com
Date:   Wed Mar 7 17:24:01 2012 +0100

Fixed a bug: when the SlideNumber placeholder field does not exist at all 
in the master page the 'element' attribute of the related PlaceholderShape 
object is null, so the 'element' attribute has to be checked in 
thePlaceholderShape.setVisibility method.

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index aa2835a..252955d 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1309,17 +1309,21 @@ PlaceholderShape.prototype.setTextContent = function( 
sText )
 
 PlaceholderShape.prototype.setVisibility = function( nVisibility )
 {
+if( !this.element )
+{
+return;
+}
 this.element.setAttribute( 'visibility', 
aVisibilityAttributeValue[nVisibility] );
 };
 
 PlaceholderShape.prototype.show = function()
 {
-this.element.setAttribute( 'visibility', 'visible' );
+this.setVisibility( VISIBLE );
 };
 
 PlaceholderShape.prototype.hide = function()
 {
-this.element.setAttribute( 'visibility', 'hidden' );
+this.setVisibility( HIDDEN );
 };
 
 /* private methods */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-02-28 Thread Andras Timar

 filter/source/pdf/impdialog.src |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e54773aa64af28795155aa55b3179141ca904f12
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 28 14:06:16 2012 +0100

fdo#45023 UI fix on PDF export dialog

diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 006fa3a..dd8d50b 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -177,8 +177,9 @@ TabPage  RID_PDF_TAB_GENER
 };
 FixedText FT_ADDSTREAMDESCRIPTION
 {
-Pos = MAP_APPFONT( 206 , 27 ) ;
-Size = MAP_APPFONT( 140, 8 ) ;
+Pos = MAP_APPFONT( 206 , 23 ) ;
+Size = MAP_APPFONT( 140, 16 ) ;
+Wordbreak = TRUE ;
 Text[ en-US ] = Makes this PDF easily editable in %PRODUCTNAME ;
 };
 CheckBox CB_PDFA_1B_SELECT
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source framework/source package/source svl/source

2012-02-15 Thread Takeshi Abe

 filter/source/config/cache/typedetection.cxx  |4 ++--
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |2 +-
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |2 +-
 package/source/xstor/xfactory.cxx |2 +-
 svl/source/fsstor/fsfactory.cxx   |4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c91ff959b0527852fde12a5f994b30121ff3c817
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Feb 16 00:21:01 2012 +0900

Use RTL_CONSTASCII_STRINGPARAM instead of bare number

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 0a06025..af907bc 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const 
::rtl::OUString sPreS
 {
 // We cant check a preselected type for a given stream!
 // So we must believe, that it can work ...
-if (aParsedURL.Complete.equalsAsciiL(private:stream, 14))
+if 
(aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(private:stream)))
 bBreakDetection = sal_True;
 }
 
@@ -1092,7 +1092,7 @@ void 
TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor rDescript
 if (
 (sURL.isEmpty() ) || // non 
existing file ?
 (!xStream.is() ) || // non 
existing file !
-(sURL.equalsIgnoreAsciiCaseAsciiL(private:stream, 14))// not a 
good idea .-)
+
(sURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(private:stream)))
// not a good idea .-)
)
 return ::rtl::OUString();
 
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx 
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index c4679f5..8e4aec6 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -273,7 +273,7 @@ void 
ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
 OUString aUIElementName( aUIElementNames[n].copy( 0, 
nIndex ));
 
 if (!aUIElementName.isEmpty() 
-( aExtension.equalsIgnoreAsciiCaseAsciiL( xml, 3 )))
+( 
aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(xml
 {
 aUIElementData.aResourceURL = aResURLPrefix + 
aUIElementName;
 aUIElementData.aName= aUIElementNames[n];
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx 
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 0803ff0..f0caf7f 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -216,7 +216,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( 
sal_Int16 nElementTy
 rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, 
nIndex ));
 
 if (!aUIElementName.isEmpty() 
-( aExtension.equalsIgnoreAsciiCaseAsciiL( xml, 3 )))
+( 
aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(xml
 {
 aUIElementData.aResourceURL = aResURLPrefix + 
aUIElementName;
 aUIElementData.aName= aUIElementNames[n];
diff --git a/package/source/xstor/xfactory.cxx 
b/package/source/xstor/xfactory.cxx
index 3602ab0..7037e61 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -156,7 +156,7 @@ uno::Reference uno::XInterface  SAL_CALL 
OStorageFactory::createInstanceWithAr
 throw lang::IllegalArgumentException(); // TODO:
 }
 
-if ( aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.pkg, 16 ) )
+if ( 
aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
 )
 {
 OSL_FAIL( Packages URL's are not valid for storages!\n ); // ???
 throw lang::IllegalArgumentException(); // TODO:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 8e21da6..ae9427d 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -143,8 +143,8 @@ uno::Reference uno::XInterface  SAL_CALL 
FSStorageFactory::createInstanceWithA
 
 // allow to use other ucp's
 // if ( !isLocalNotFile_Impl( aURL ) )
-if ( aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.pkg, 16 )
-  || aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.zip, 16 )
+if ( 
aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
+  ||

[Libreoffice-commits] .: filter/source sal/inc

2012-02-09 Thread Caolán McNamara

 filter/source/msfilter/msdffimp.cxx |   19 ---
 sal/inc/sal/log-areas.dox   |4 
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 5154135e36f6b4ab78925782672d70ab37664706
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Feb 9 10:49:48 2012 +

fix ppt embedded graphic dumper

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 2a91c24..aee3bd9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -142,6 +142,7 @@
 #include com/sun/star/drawing/ProjectionMode.hpp
 #include svx/EnhancedCustomShape2d.hxx
 #include rtl/strbuf.hxx
+#include rtl/oustringostreaminserter.hxx
 #include boost/scoped_array.hpp
 
 using namespace ::com::sun::star;
@@ -6713,10 +6714,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 
 #if OSL_DEBUG_LEVEL  2
 // extract graphics from ole storage into dbggfxNNN.*
-static sal_Int32 nCount;
+static sal_Int32 nGrfCount;
 
-String aFileName( String( RTL_CONSTASCII_STRINGPARAM( dbggfx ) ) );
-aFileName.Append( String::CreateFromInt32( nCount++ ) );
+String aFileName( String( RTL_CONSTASCII_USTRINGPARAM( dbggfx ) ) );
+aFileName.Append( String::CreateFromInt32( nGrfCount++ ) );
 switch( nInst ~ 1 )
 {
 case 0x216 : aFileName.Append( String( 
RTL_CONSTASCII_USTRINGPARAM( .wmf ) ) ); break;
@@ -6736,7 +6737,11 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 aURL.removeFinalSlash();
 aURL.Append( aFileName );
 
-SvStream* pDbgOut = ::utl::UcbStreamHelper::CreateStream( 
aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_TRUNC | STREAM_WRITE );
+aURLStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
+
+SAL_INFO(filter.ms, dumping   aURLStr);
+
+SvStream* pDbgOut = ::utl::UcbStreamHelper::CreateStream(aURLStr, 
STREAM_TRUNC | STREAM_WRITE);
 
 if( pDbgOut )
 {
@@ -7310,9 +7315,9 @@ com::sun::star::uno::Reference  
com::sun::star::embed::XEmbeddedObject   SvxMS
 
 #if OSL_DEBUG_LEVEL  2
 // extract embedded ole streams into /tmp/embedded_stream_NNN
-static sal_Int32 nCount(0);
-String 
aTmpName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(/tmp/embedded_stream_)));
-aTmpName += String::CreateFromInt32(nCount++);
+static sal_Int32 nOleCount(0);
+String aTmpName(RTL_CONSTASCII_USTRINGPARAM(/tmp/embedded_stream_));
+aTmpName += String::CreateFromInt32(nOleCount++);
 aTmpName += 
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(.bin));
 SvFileStream 
aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
 pStream-Seek(0);
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 1af17a3..d89bbdc 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -17,6 +17,10 @@ certain functionality.
 
 @li sc.ui - Calc's UI
 
+@section Filter
+
+@li filter.ms - escher export/import support
+
 @section oox
 
 @li oox.xmlstream - XmlStream class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2012-02-08 Thread Lubos Lunak

 filter/source/msfilter/msdffimp.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 38af1195a9a24af4aaff84e7be318007b82f9b47
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Wed Feb 8 17:38:57 2012 +0100

do not deserialize into long, use a type of the correct width (fdo#40768)

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 5871da9..2a91c24 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6672,7 +6672,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 rBLIPStream.SeekRel( nSkip + 20 );
 
 // read in size of metafile in EMUS
-rBLIPStream  aMtfSize100.Width()  aMtfSize100.Height();
+sal_Int32 width, height;
+rBLIPStream  width  height;
+aMtfSize100.Width() = width;
+aMtfSize100.Height() = height;
 
 // scale to 1/100mm
 aMtfSize100.Width() /= 360, aMtfSize100.Height() /= 360;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source svx/inc

2012-02-04 Thread Caolán McNamara

 filter/source/msfilter/msdffimp.cxx |6 +++---
 svx/inc/svx/msdffdef.hxx|3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 28a6558f9d3ca2dda3191f8b5b3f2378ee2533da
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sat Feb 4 01:17:03 2012 +0100

extract max legal dff length to header

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 8f25ac8..5871da9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3422,6 +3422,8 @@ bool SvxMSDffManager::SeekToRec( SvStream rSt, 
sal_uInt16 nRecId, sal_uLong nMa
 rSt  aHd;
 if (!rSt.good())
 break;
+if (aHd.nRecLen  nMaxLegalDffRecordLength)
+break;
 if ( aHd.nRecType == nRecId )
 {
 if ( nSkipCount )
@@ -6818,8 +6820,6 @@ bool 
SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader rRec,
 rRec.nRecInstance, rRec.nRecType, rRec.nRecLen);
 }
 
-sal_uInt32 nMaxLegalRecordLength = SAL_MAX_UINT32 - 
DFF_COMMON_RECORD_HEADER_SIZE;
-
 /* also static */
 bool SvxMSDffManager::ReadCommonRecordHeader(SvStream rSt,
 sal_uInt8 rVer, sal_uInt16 rInst, sal_uInt16 rFbt, sal_uInt32 rLength)
@@ -6830,7 +6830,7 @@ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream 
rSt,
 rInst = nTmp  4;
 if (!rSt.good())
 return false;
-if (rLength  nMaxLegalRecordLength)
+if (rLength  nMaxLegalDffRecordLength)
 return false;
 return true;
 }
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 42acdbb..016197f 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -37,6 +37,9 @@
 
 #define DFF_COMMON_RECORD_HEADER_SIZE   8
 
+const sal_uInt32 nMaxLegalDffRecordLength = \
+SAL_MAX_UINT32 - DFF_COMMON_RECORD_HEADER_SIZE;
+
 #define DFF_PSFLAG_CONTAINER 0x0F // If the version field of a record
   //  header takes on this value, the
   //  record header marks the start of
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-12-28 Thread Julien Nabet

 filter/source/pdf/impdialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a8c895bc18f3167961ab676ec17e1db41d6a378
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Dec 28 23:15:03 2011 +0100

Fix order init

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index b10bf68..583b96b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -461,9 +461,9 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
 maCbAllowDuplicateFieldNames( this, PDFFilterResId( 
CB_ALLOWDUPLICATEFIELDNAMES ) ),
 
 maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
+maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
 maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
 maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
-maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
 maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
 maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
 maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION ) 
),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source sc/source starmath/source vcl/source

2011-12-07 Thread Eike Rathke

 filter/source/svg/svgwriter.hxx |9 +-
 sc/source/core/tool/chgtrack.cxx|9 ++
 sc/source/filter/xcl97/xcl97esc.cxx |   14 +++-
 sc/source/filter/xml/xmlfilti.hxx   |   10 ++
 starmath/source/mathmlimport.cxx|   94 +++
 starmath/source/mathmlimport.hxx|2 
 starmath/source/parse.cxx   |  124 ++--
 vcl/source/gdi/cvtsvm.cxx   |   20 -
 8 files changed, 140 insertions(+), 142 deletions(-)

New commits:
commit cabf25372cf98869616c3d583eb99fa5f5eb3a8f
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 7 16:11:57 2011 +0100

old class Stack pop'ed 0 from empty stack, which std::stack doesn't

Some places in the code assumed that if the stack is empty a null pointer is
returned by top() (or old Pop()), this doesn't work anymore with 
::std::stack
that instead has undefined behavior in that case, so check !stack.empty()
first before accessing top.
(cherry picked from commit ac40f7d6503533954127e818f2bf009200c1e3f2)

diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 0b6048e..b4fe4ae 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -186,9 +186,12 @@ private:
 }
 voidImplReleaseContext()
 {
-delete maContextStack.top();
-maContextStack.pop();
-mpContext = maContextStack.top();
+if (!maContextStack.empty())
+{
+delete maContextStack.top();
+maContextStack.pop();
+}
+mpContext = (maContextStack.empty() ? NULL : maContextStack.top());
 }
 
 longImplMap( sal_Int32 nVal ) const;
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index a94b0d3..7a85014 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -2240,8 +2240,13 @@ void ScChangeTrack::EndBlockModify( sal_uLong nEndAction 
)
 }
 else
 delete pBlockModifyMsg;
-pBlockModifyMsg = aMsgStackTmp.top();   // evtl. Block im Block
-aMsgStackTmp.pop();
+if (aMsgStackTmp.empty())
+pBlockModifyMsg = NULL;
+else
+{
+pBlockModifyMsg = aMsgStackTmp.top();   // evtl. Block im Block
+aMsgStackTmp.pop();
+}
 }
 if ( !pBlockModifyMsg )
 {
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx 
b/sc/source/filter/xcl97/xcl97esc.cxx
index 207a37d..50b53c2 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -346,9 +346,17 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, 
sal_uInt32 nShapeID )
 
 // get next object from stack
 DeleteCurrAppData();
-pCurrXclObj = aStack.top().first;
-pCurrAppData = aStack.top().second;
-aStack.pop();
+if (aStack.empty())
+{
+pCurrXclObj = NULL;
+pCurrAppData = NULL;
+}
+else
+{
+pCurrXclObj = aStack.top().first;
+pCurrAppData = aStack.top().second;
+aStack.pop();
+}
 if( nAdditionalText == 3 )
 nAdditionalText = 0;
 }
diff --git a/sc/source/filter/xml/xmlfilti.hxx 
b/sc/source/filter/xml/xmlfilti.hxx
index bb30101..759f954 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -262,8 +262,14 @@ public:
 
 void CloseConnection()
 {
-bool bTemp = aConnectionOrStack.top();
-aConnectionOrStack.pop();
+bool bTemp;
+if (aConnectionOrStack.empty())
+bTemp = false;
+else
+{
+bTemp = aConnectionOrStack.top();
+aConnectionOrStack.pop();
+}
 bConnectionOr = bTemp;
 bNextConnectionOr = bTemp;
 }
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 0db8cc4..9290127 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -95,6 +95,18 @@ using ::rtl::OUStringBuffer;
 
 
 
+namespace {
+template  typename T 
+T* lcl_popOrZero( ::std::stackT*  rStack )
+{
+if (rStack.empty())
+return 0;
+T* pTmp = rStack.top();
+rStack.pop();
+return pTmp;
+}
+}
+
 sal_uLong SmXMLImportWrapper::Import(SfxMedium rMedium)
 {
 sal_uLong nError = ERRCODE_SFX_DOLOADFAILED;
@@ -747,8 +759,7 @@ void SmXMLContext_Helper::ApplyAttrs()
 aToken.eType = TNBOLD;
 SmStructureNode *pFontNode = static_castSmStructureNode *
 (new SmFontNode(aToken));
-pFontNode-SetSubNodes(0,rNodeStack.top());
-rNodeStack.pop();
+pFontNode-SetSubNodes(0,lcl_popOrZero(rNodeStack));
 rNodeStack.push(pFontNode);
 }
 if (nIsItalic != -1)
@@ -759,8 +770,7 @@ void SmXMLContext_Helper::ApplyAttrs()

[Libreoffice-commits] .: filter/source lingucomponent/source linguistic/workben rsc/source sc/source sfx2/source svx/inc sw/inc sw/source

2011-12-06 Thread Eike Rathke

 filter/source/xsltdialog/xmlfileview.hxx   |1 -
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx |1 -
 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx   |1 -
 lingucomponent/source/spellcheck/spell/sspellimp.hxx   |1 -
 lingucomponent/source/thesaurus/libnth/nthesimp.hxx|2 --
 linguistic/workben/sspellimp.hxx   |1 -
 rsc/source/tools/rscchar.cxx   |2 --
 sc/source/filter/inc/xcl97esc.hxx  |1 -
 sfx2/source/bastyp/frmhtml.cxx |1 -
 svx/inc/svx/msdffdef.hxx   |1 -
 svx/inc/svx/xtable.hxx |1 -
 sw/inc/docary.hxx  |1 -
 sw/inc/hints.hxx   |1 -
 sw/source/filter/writer/writer.cxx |1 +
 14 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 4c2dcaf1307ca4711c9b622796914e87eb64145b
Author: Marcel Metz mm...@adrian-broher.net
Date:   Tue Dec 6 15:25:35 2011 +0100

Removed unnessecary tools/table.hxx includes

diff --git a/filter/source/xsltdialog/xmlfileview.hxx 
b/filter/source/xsltdialog/xmlfileview.hxx
index b03bc76..5edd096 100644
--- a/filter/source/xsltdialog/xmlfileview.hxx
+++ b/filter/source/xsltdialog/xmlfileview.hxx
@@ -35,7 +35,6 @@
 #include tools/table.hxx
 #include svtools/xtextedt.hxx
 #include vcl/timer.hxx
-#include tools/table.hxx
 #include vcl/wrkwin.hxx
 #include vcl/ctrl.hxx
 #include vcl/button.hxx
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx 
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index fb2ba59..933155b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -42,7 +42,6 @@
 #include com/sun/star/linguistic2/XHyphenator.hpp
 #include com/sun/star/linguistic2/XSearchableDictionaryList.hpp
 #include com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp
-#include tools/table.hxx
 
 #include unotools/charclass.hxx
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index f877685..1f88342 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -48,7 +48,6 @@
 #include com/sun/star/linguistic2/XSpellChecker.hpp
 #include com/sun/star/linguistic2/XSearchableDictionaryList.hpp
 #include com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp
-#include tools/table.hxx
 
 #include linguistic/misc.hxx
 #include linguistic/lngprophelp.hxx
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index c561b22..d862dbd 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -41,7 +41,6 @@
 #include com/sun/star/linguistic2/XSpellChecker.hpp
 #include com/sun/star/linguistic2/XSearchableDictionaryList.hpp
 #include com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp
-#include tools/table.hxx
 
 #include linguistic/misc.hxx
 #include linguistic/lngprophelp.hxx
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx 
b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 7baa32d..58957f9 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -47,8 +47,6 @@
 #include com/sun/star/linguistic2/XLinguServiceManager.hpp
 #include com/sun/star/linguistic2/XSpellChecker1.hpp
 
-#include tools/table.hxx
-
 #include unotools/charclass.hxx
 
 #include lingutil.hxx
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index 5e839b4..b2ebeff 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -41,7 +41,6 @@
 #include com/sun/star/linguistic2/XSpellChecker.hpp
 #include com/sun/star/linguistic2/XSearchableDictionaryList.hpp
 #include com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp
-#include tools/table.hxx
 
 #include linguistic/misc.hxx
 #include sprophelp.hxx
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
index c43874c..f4b7464 100644
--- a/rsc/source/tools/rscchar.cxx
+++ b/rsc/source/tools/rscchar.cxx
@@ -31,8 +31,6 @@
 #include string.h
 #include ctype.h
 
-#include tools/table.hxx
-
 // Solar Definitionen
 #include tools/solar.h
 #include rsctools.hxx
diff --git a/sc/source/filter/inc/xcl97esc.hxx 
b/sc/source/filter/inc/xcl97esc.hxx
index a2af601..3634874 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@

[Libreoffice-commits] .: filter/source

2011-11-28 Thread Caolán McNamara

 filter/source/xsltdialog/xmlfiltertabdialog.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f26974181331713b166119d7149c5b280bf3a83e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 28 16:51:54 2011 +

The vcl tabdlg, not the sfx2 one, is the one actually used

diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx 
b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 7a4a539..ad8d889 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -29,7 +29,9 @@
 #define _XMLFILTERTABDIALOG_HXX_
 
 #include com/sun/star/lang/XMultiServiceFactory.hpp
-#include sfx2/tabdlg.hxx
+#include vcl/tabctrl.hxx
+#include vcl/tabdlg.hxx
+#include vcl/button.hxx
 
 class Window;
 class ResMgr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-11-26 Thread August Sodora

 filter/source/msfilter/powerpoint/pptcom.hxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit aa0cca15073bc59e379a1e1754c8e7be1a93dd05
Author: August Sodora aug...@gmail.com
Date:   Sat Nov 26 23:00:50 2011 -0500

Remove unnecessary tools includes

diff --git a/filter/source/msfilter/powerpoint/pptcom.hxx 
b/filter/source/msfilter/powerpoint/pptcom.hxx
index 92e80cb..8660c19 100644
--- a/filter/source/msfilter/powerpoint/pptcom.hxx
+++ b/filter/source/msfilter/powerpoint/pptcom.hxx
@@ -30,11 +30,6 @@
 #define _PPTCOM_HXX
 
 #include rtl/ustring.hxx
-#include tools/debug.hxx
-#include tools/stream.hxx
-#include tools/string.hxx
-#include tools/urlobj.hxx
-#include tools/stack.hxx
 
 #include com/sun/star/uno/Reference.h
 #include com/sun/star/uno/RuntimeException.hpp
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-11-24 Thread Andras Timar

 filter/source/xsltdialog/xmlfiltersettingsdialog.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22468d4d7a03c0b002f76111950166e2a6bbee97
Author: Andras Timar ati...@suse.com
Date:   Thu Nov 24 11:56:19 2011 +0100

Global resources should have an identifier = 256

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc
index d611e2d..7f12904 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hrc
@@ -39,5 +39,5 @@
 #define PB_XML_FILTER_OPEN  7
 #define BTN_XML_FILTER_HELP 8
 #define PB_XML_FILTER_CLOSE 9
-#define STR_XML_FILTER_LISTBOX  10
+#define STR_XML_FILTER_LISTBOX  1000
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-11-01 Thread Thorsten Behrens

 filter/source/msfilter/svdfppt.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 812aff65ad0661fed9687a429c763dc8f2144a0c
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Tue Oct 25 19:49:34 2011 +0200

Fix fdo#41245 : Auto fit text VIEWING too small in PPT

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index bb1e8b3..fc987b8 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1073,12 +1073,10 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream rSt, 
DffObjData rObjData, voi
 }
 pTObj-SetMergedItem( SvxFrameDirectionItem( bVerticalText ? 
FRMDIR_VERT_TOP_RIGHT : FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );
 
-if (bAutoFit)
+//Autofit text only if there is no auto grow height and width
+//See fdo#41245
+if (bAutoFit  !bAutoGrowHeight  !bAutoGrowWidth)
 {
-// disable both, defeats purpose of autofit
-// otherwise
-bAutoGrowHeight = sal_False;
-bAutoGrowWidth = sal_False;
 pTObj-SetMergedItem( 
SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

2011-10-18 Thread Peter Jentsch

 filter/source/xsltdialog/xmlfiltercommon.hxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0eee1cf957d122ac0d805a9589a5db075a94e4a1
Author: Peter Jentsch pj...@guineapics.de
Date:   Tue Oct 18 22:52:50 2011 +0200

fixed reorder warning in copy-constructor of filter_info_impl

diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx 
b/filter/source/xsltdialog/xmlfiltercommon.hxx
index c1da769..cdb767e 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -70,13 +70,15 @@ public:
 rtl::OUString   maDocType;
 rtl::OUString   maImportService;
 rtl::OUString   maExportService;
-rtl::OUString   maXSLTTransformerImpl;
 
 sal_Int32   maFlags;
 sal_Int32   maFileFormatVersion;
 sal_Int32   mnDocumentIconID;
 
 sal_BoolmbReadonly;
+
+rtl::OUString   maXSLTTransformerImpl;
+
 filter_info_impl();
 filter_info_impl( const filter_info_impl rInfo );
 int operator==( const filter_info_impl ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

94 matches

Mail list logo