date:20111128

[Libreoffice-commits] .: sot/source svl/source svtools/source unotools/inc unotools/source xmlsecurity/source

2011-11-28 Thread Stephan Bergmann

 sot/source/sdstor/ucbstorage.cxx   |1 
 svl/source/fsstor/fsstorage.cxx|1 
 svtools/source/contnr/templwin.cxx |7 
 svtools/source/control/inettbc.cxx |9 
 unotools/inc/unotools/ucbhelper.hxx|   91 -
 unotools/source/ucbhelper/ucbhelper.cxx|  995 +
 xmlsecurity/source/component/documentdigitalsignatures.cxx |   15 
 7 files changed, 465 insertions(+), 654 deletions(-)

New commits:
commit 2af9040d38af7c7353855415dbea0134585058f3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 28 10:09:57 2011 +0100

Cleaned up utl::UCBContentHelper.

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d0b3534..b6fb581 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -32,6 +32,7 @@
 #include com/sun/star/lang/IllegalArgumentException.hpp
 #include ucbhelper/content.hxx
 #include com/sun/star/uno/Reference.h
+#include com/sun/star/ucb/NameClash.hpp
 #include com/sun/star/ucb/XCommandEnvironment.hpp
 #include unotools/tempfile.hxx
 #include unotools/ucbstreamhelper.hxx
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 7617563..4fbc780 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -29,6 +29,7 @@
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/embed/ElementModes.hpp
 #include com/sun/star/embed/XTransactedObject.hpp
+#include com/sun/star/ucb/NameClash.hpp
 #include com/sun/star/ucb/XProgressHandler.hpp
 #include com/sun/star/ucb/XContentAccess.hpp
 #include com/sun/star/ucb/XSimpleFileAccess.hpp
diff --git a/svtools/source/contnr/templwin.cxx 
b/svtools/source/contnr/templwin.cxx
index 00623c3..3792826 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -236,10 +236,9 @@ void ODocumentInfoPreview::fill(
 // size
 if ( i_rURL.Len()  0 )
 {
-sal_uLong nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL );
 m_pEditWin-InsertEntry(
 m_pInfoTable-GetString( DI_SIZE ),
-CreateExactSizeText_Impl( nDocSize ) );
+CreateExactSizeText_Impl( utl::UCBContentHelper::GetSize( i_rURL ) 
) );
 }
 
 // MIMEType
@@ -749,8 +748,8 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String 
rURL ) const
 
 String SvtFileViewWindow_Impl::GetFolderTitle() const
 {
-String aTitle;
-::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle );
+rtl::OUString aTitle;
+::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle );
 return aTitle;
 }
 
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index 9ed13a1..21547e3 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1200,7 +1200,7 @@ String SvtURLBox::GetURL()
 Any aAny =
 UCBContentHelper::GetProperty(aURL,aPropName);
 sal_Bool success = (aAny = aFileURL);
-String aTitle;
+rtl::OUString aTitle;
 if(success)
 aTitle = String(
 INetURLObject(aFileURL).getName(
@@ -1209,12 +1209,11 @@ String SvtURLBox::GetURL()
 INetURLObject::DECODE_WITH_CHARSET ));
 else
 success =
-UCBContentHelper::GetTitle(aURL,aTitle);
+UCBContentHelper::GetTitle(aURL,aTitle);
 
 if( success 
-( aTitle.Len()  1 ||
-  (aTitle.CompareToAscii(/) != 0 
-  aTitle.CompareToAscii(.) != 0) ) )
+!(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(/))
+  || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(.))) )
 {
 aObj.SetName( aTitle );
 if ( bSlash )
diff --git a/unotools/inc/unotools/ucbhelper.hxx 
b/unotools/inc/unotools/ucbhelper.hxx
index b0ed12a..358d8e1 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -25,55 +25,58 @@
  * for a copy of the LGPLv3 License.
  *
  /
-#include unotools/unotoolsdllapi.h
 
 #ifndef _UNOTOOLS_UCBHELPER_HXX
 #define _UNOTOOLS_UCBHELPER_HXX
 
-// include ---
-#include com/sun/star/uno/Sequence.hxx
-#include com/sun/star/uno/Reference.hxx
-#include com/sun/star/ucb/NameClash.hpp
-#include com/sun/star/ucb/XContentProvider.hpp
-
-#include tools/string.hxx
-
-namespace ucbhelper
-{
-class Content;
-}
-
-namespace utl
-{
-class UNOTOOLS_DLLPUBLIC UCBContentHelper
-{
-public:
-static sal_Bool IsDocument( const String rContent );
-static sal_Bool IsFolder( const String rContent );
-

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

2011-11-28 Thread Stephan Bergmann

 sw/inc/index.hxx|2 +-
 sw/source/core/bastyp/index.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5a8fef9b8e3ecc6658c477bdf903fe9e196db596
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 28 10:13:57 2011 +0100

Undo short - xub_StrLen change (fixes warning on Mac OS X).

diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index ec5a980..a671e04 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -67,7 +67,7 @@ private:
 public:
 explicit SwIndex(SwIndexReg *const pReg, xub_StrLen const nIdx = 0);
 SwIndex( const SwIndex  );
-SwIndex( const SwIndex , xub_StrLen const nDiff );
+SwIndex( const SwIndex , short nDiff );
 ~SwIndex() { Remove(); }
 
 INLINE SwIndex operator=( xub_StrLen const );
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 112430f..70b5712 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -46,7 +46,7 @@ SwIndex::SwIndex(SwIndexReg *const pReg, xub_StrLen const 
nIdx)
 Init(m_nIndex);
 }
 
-SwIndex::SwIndex( const SwIndex rIdx, xub_StrLen const nDiff )
+SwIndex::SwIndex( const SwIndex rIdx, short nDiff )
 : m_pIndexReg( rIdx.m_pIndexReg )
 , m_pNext( 0 )
 , m_pPrev( 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cppcanvas/source svx/source

2011-11-28 Thread Radek Doulík

 cppcanvas/source/mtfrenderer/emfplus.cxx  |   23 ++
 svx/source/customshapes/EnhancedCustomShape2d.cxx |1 
 2 files changed, 24 insertions(+)

New commits:
commit c08d55eccc1b2e26d8d0408d70654751e8672fa7
Author: Radek Doulik r...@novell.com
Date:   Fri Nov 25 16:12:42 2011 +0100

make sure the bOOXMLShape flag is initialized

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 8e25997..12fb3e4 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -694,6 +694,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* 
pAObj ) :
 nCoordTop   ( 0 ),
 nCoordWidth ( 21600 ),
 nCoordHeight( 21600 ),
+bOOXMLShape ( sal_False ),
 nXRef   ( 0x8000 ),
 nYRef   ( 0x8000 ),
 nFlags  ( 0 ),
commit d169860411a7fea060079d8ca27797b10af44732
Author: Radek Doulik r...@novell.com
Date:   Wed Nov 16 09:23:39 2011 +0100

more debug info for emf+ rendering - path

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index fe5a129..91c9560 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -207,6 +207,7 @@ namespace cppcanvas
 if ((pPointTypes [i]  0x07) == 3) {
 if (((i - last_normal )% 3) == 1) {
 polygon.setNextControlPoint (p - 1, mapped);
+EMFP_DEBUG (printf (polygon append  next: %d 
mapped: %f,%f\n, p - 1, mapped.getX (), mapped.getY ()));
 continue;
 } else if (((i - last_normal) % 3) == 2) {
 prev = mapped;
@@ -217,14 +218,17 @@ namespace cppcanvas
 last_normal = i;
 }
 polygon.append (mapped);
+EMFP_DEBUG (printf (polygon append point: %f,%f mapped: 
%f,%f\n, pPoints [i*2], pPoints [i*2 + 1], mapped.getX (), mapped.getY ()));
 if (hasPrev) {
 polygon.setPrevControlPoint (p, prev);
+EMFP_DEBUG (printf (polygon append  prev: %d mapped: 
%f,%f\n, p, prev.getX (), prev.getY ()));
 hasPrev = false;
 }
 p ++;
 if (pPointTypes  (pPointTypes [i]  0x80)) { // closed 
polygon
 polygon.setClosed (true);
 aPolygon.append (polygon);
+EMFP_DEBUG (printf (close polygon\n));
 last_normal = i + 1;
 p = 0;
 polygon.clear ();
@@ -234,6 +238,25 @@ namespace cppcanvas
 if (polygon.count ())
 aPolygon.append (polygon);
 
+EMFP_DEBUG (
+for (unsigned int i=0; iaPolygon.count(); i++) {
+polygon = aPolygon.getB2DPolygon(i);
+printf (polygon: %d\n, i);
+for (unsigned int j=0; jpolygon.count(); j++) {
+::basegfx::B2DPoint point = polygon.getB2DPoint(j);
+printf (point: %f,%f\n, point.getX(), 
point.getY());
+if (polygon.isPrevControlPointUsed(j)) {
+point = polygon.getPrevControlPoint(j);
+printf (prev: %f,%f\n, point.getX(), 
point.getY());
+}
+if (polygon.isNextControlPointUsed(j)) {
+point = polygon.getNextControlPoint(j);
+printf (next: %f,%f\n, point.getX(), 
point.getY());
+}
+}
+}
+);
+
 return aPolygon;
 }
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Thorsten Behrens

 i18npool/source/localedata/data/fi_FI.xml |  134 --
 1 file changed, 129 insertions(+), 5 deletions(-)

New commits:
commit 227eef01b8fc343fd51f4d6a628dedbbc311c68c
Author: Harri PitkÃ¤nen hatap...@iki.fi
Date:   Sun Nov 27 19:01:52 2011 +0200

Add genitive and partitive month names for fi_FI locale

Add genitive and partitive month names and remove hardcoded case
suffixes from predefined date formats. One format incorrectly
had case suffixes added to abbreviated month names.

diff --git a/i18npool/source/localedata/data/fi_FI.xml 
b/i18npool/source/localedata/data/fi_FI.xml
index 1f7747d..7980be9 100644
--- a/i18npool/source/localedata/data/fi_FI.xml
+++ b/i18npool/source/localedata/data/fi_FI.xml
@@ -87,7 +87,7 @@
   FormatCodeP.K./FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey9 default=true type=long 
usage=DATE formatindex=19
-  FormatCodeP. ta /FormatCode
+  FormatCodeP.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey8 default=true type=medium 
usage=DATE formatindex=20
   FormatCodePP.KK.VV/FormatCode
@@ -105,22 +105,22 @@
   FormatCodeP. KKK. /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey12 default=false type=long 
usage=DATE formatindex=25
-  FormatCodeP. ta /FormatCode
+  FormatCodeP.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=long 
usage=DATE formatindex=26
   FormatCodeP.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey13 default=false type=long 
usage=DATE formatindex=27
-  FormatCodeNN P. KKKta VV/FormatCode
+  FormatCodeNN P. KKK VV/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey2 default=false type=medium 
usage=DATE formatindex=28
   FormatCodeNN PP. KKK VV/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey14 default=false type=long 
usage=DATE formatindex=29
-  FormatCodeNN P. ta /FormatCode
+  FormatCodeNN P.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey15 default=false type=long 
usage=DATE formatindex=30
-  FormatCodeP. ta /FormatCode
+  FormatCodeP.  /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey18 default=false type=short 
usage=DATE formatindex=31
   FormatCodeKK-PP/FormatCode
@@ -286,6 +286,130 @@
   DefaultFullNamejoulukuu/DefaultFullName
 /Month
   /MonthsOfYear
+  GenitiveMonths
+Month
+  MonthIDjan/MonthID
+  DefaultAbbrvNametammi/DefaultAbbrvName
+  DefaultFullNametammikuun/DefaultFullName
+/Month
+Month
+  MonthIDfeb/MonthID
+  DefaultAbbrvNamehelmi/DefaultAbbrvName
+  DefaultFullNamehelmikuun/DefaultFullName
+/Month
+Month
+  MonthIDmar/MonthID
+  DefaultAbbrvNamemaalis/DefaultAbbrvName
+  DefaultFullNamemaaliskuun/DefaultFullName
+/Month
+Month
+  MonthIDapr/MonthID
+  DefaultAbbrvNamehuhti/DefaultAbbrvName
+  DefaultFullNamehuhtikuun/DefaultFullName
+/Month
+Month
+  MonthIDmay/MonthID
+  DefaultAbbrvNametouko/DefaultAbbrvName
+  DefaultFullNametoukokuun/DefaultFullName
+/Month
+Month
+  MonthIDjun/MonthID
+  DefaultAbbrvNamekesÃ¤/DefaultAbbrvName
+  DefaultFullNamekesÃ¤kuun/DefaultFullName
+/Month
+Month
+  MonthIDjul/MonthID
+  DefaultAbbrvNameheinÃ¤/DefaultAbbrvName
+  DefaultFullNameheinÃ¤kuun/DefaultFullName
+/Month
+Month
+  MonthIDaug/MonthID
+  DefaultAbbrvNameelo/DefaultAbbrvName
+  DefaultFullNameelokuun/DefaultFullName
+/Month
+Month
+  MonthIDsep/MonthID
+  DefaultAbbrvNamesyys/DefaultAbbrvName
+  DefaultFullNamesyyskuun/DefaultFullName
+/Month
+Month
+  MonthIDoct/MonthID
+  DefaultAbbrvNameloka/DefaultAbbrvName
+  DefaultFullNamelokakuun/DefaultFullName
+/Month
+Month
+  MonthIDnov/MonthID
+  DefaultAbbrvNamemarras/DefaultAbbrvName
+  DefaultFullNamemarraskuun/DefaultFullName
+/Month
+Month
+  MonthIDdec/MonthID
+  DefaultAbbrvNamejoulu/DefaultAbbrvName
+  DefaultFullNamejoulukuun/DefaultFullName
+/Month
+  /GenitiveMonths
+  PartitiveMonths
+Month
+  MonthIDjan/MonthID
+  DefaultAbbrvNametammi/DefaultAbbrvName
+  DefaultFullNametammikuuta/DefaultFullName
+/Month
+Month
+  MonthIDfeb/MonthID
+  DefaultAbbrvNamehelmi/DefaultAbbrvName
+  DefaultFullNamehelmikuuta/DefaultFullName
+/Month
+Month
+  MonthIDmar/MonthID
+

[Libreoffice-commits] .: oox/inc

2011-11-28 Thread Jan Holesovsky

 oox/inc/oox/mathml/importutils.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dabe836c6ed66c5740582c17dbc39b2196608e6d
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Nov 28 11:24:14 2011 +0100

Fix visibility problem on Windows.

diff --git a/oox/inc/oox/mathml/importutils.hxx 
b/oox/inc/oox/mathml/importutils.hxx
index ad6ad6b..3a59320 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -71,7 +71,7 @@ public:
 // One could theoretically use oox::AttributeList, but that complains if 
the passed reference is empty,
 // which would be complicated to avoid here. Also, parsers apparently 
reuse the same instance of XFastAttributeList,
 // which means using oox::AttributeList would make them all point to the 
one instance.
-struct AttributeList
+struct OOX_DLLPUBLIC AttributeList
 {
 bool hasAttribute( int token ) const;
 rtl::OUString attribute( int token, const rtl::OUString def = 
rtl::OUString()) const;
@@ -82,7 +82,7 @@ public:
 /**
  Structure representing a tag, including its attributes and content text 
immediatelly following it.
 */
-struct Tag
+struct OOX_DLLPUBLIC Tag
 {
 Tag( int token = XML_TOKEN_INVALID,
 const com::sun::star::uno::Reference 
com::sun::star::xml::sax::XFastAttributeList  attributes = 
com::sun::star::uno::Reference com::sun::star::xml::sax::XFastAttributeList 
(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source vcl/generic

2011-11-28 Thread Thorsten Behrens

 sw/source/core/text/itradj.cxx|4 
 vcl/generic/glyphs/gcach_ftyp.cxx |1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d13e9baca52a9e8f07312ee03915bcdeac1ab4cd
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon Nov 28 11:51:42 2011 +0100

Fix Kashida justification when there is no Kashida glyph

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 925bee6..92eb70b 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -164,6 +164,10 @@ bool lcl_CheckKashidaPositions( SwScriptInfo rSI, 
SwTxtSizeInfo rInf, SwTxtIte
 xub_StrLen nKashidasInAttr = rSI.KashidaJustify ( 0, 0, nIdx, nNext - 
nIdx );
 if ( nKashidasInAttr )
 {
+// Kashida glyph looks suspicious, skip Kashida justification
+if ( rInf.GetOut()-GetMinKashida() = 0 )
+return false;
+
 xub_StrLen nKashidasDropped = 0;
 if ( !SwScriptInfo::IsArabicText( rInf.GetTxt(), nIdx, nNext - 
nIdx ) )
 {
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index d009d81..7d14ce8 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1097,7 +1097,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData 
rTo, long rFactor ) const
 
 // initialize kashida width
 // TODO: what if there are different versions of this glyph available
-rTo.mnMinKashida = rTo.mnAscent / 4; // a reasonable default
 const int nKashidaGlyphId = GetRawGlyphIndex( 0x0640 );
 if( nKashidaGlyphId )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Tor Lillqvist

 configure.in |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7c8c4f783101a427da5e1f44eede054595a72605
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Nov 27 00:20:38 2011 +0200

Add comment about SOLAR_JAVA's alleged BUILD value

diff --git a/configure.in b/configure.in
index 2f8cf7f..3977d7f 100644
--- a/configure.in
+++ b/configure.in
@@ -3875,7 +3875,12 @@ AC_SUBST(SOLAR_JAVA)
 dnl SOLAR_JAVA=YES (yes, silly name, should rename) indicates whether we
 dnl want there to be *run-time* (and build-time) support for Java extensions 
in the
 dnl built LibreOffice.
-dnl SOLAR_JAVA=BUILD indicate build-time only support (no runtime support)
+
+dnl SOLAR_JAVA=BUILD is claimed to indicate build-time only support
+dnl (no runtime support). It doesn't seem to ever be set to this
+dnl value, though, and everywhere SOLAR_JAVA is only checked for being
+dnl empty or non-empty.
+
 dnl SOLAR_JAVA= indicate no java support at all
 
 if test $_os = Linux  test $host_cpu = powerpc; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-28 Thread Noel Power

 sc/source/ui/app/inputwin.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit e46454b676bedc5585456cc37c63c9e4ff7deaad
Author: Noel Power noel.po...@novell.com
Date:   Mon Nov 28 10:58:31 2011 +

reorganise some resize logic

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5c94f0b..63265f9 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -520,9 +520,9 @@ void ScInputWindow::Resize()
 ToolBox::Resize();
 if ( lcl_isExperimentalMode() )
 {
-Size aSize = GetSizePixel();
 aTextWindow.Resize();
-aSize.Height() = aTextWindow.GetSizePixel().Height() + 11;
+Size aSize = GetSizePixel();
+aSize.Height() = CalcWindowSizePixel().Height();
 SetSizePixel(aSize);
 Invalidate();
 }
@@ -1027,7 +1027,6 @@ IMPL_LINK( ScInputBarGroup, ClickHdl, PushButton*, 
EMPTYARG )
 OSL_FAIL(The parent window pointer pParent is null);
 return 1;
 }
-
 if( aMultiTextWnd.GetNumLines()  1 )
 {
 aMultiTextWnd.SetNumLines( 1 );
@@ -1064,7 +1063,6 @@ void ScInputBarGroup::TriggerToolboxLayout()
 else
 pParent-SetToolbarLayoutMode( TBX_LAYOUT_NORMAL );
 xLayoutManager-lock();
-pParent-Resize();
 DataChangedEvent aFakeUpdate( DATACHANGED_SETTINGS, NULL,  
SETTINGS_STYLE );
 // this basically will trigger the reposititioning of the
 // items in the toolbar from ImplFormat ( which is controlled by
@@ -1073,6 +1071,10 @@ void ScInputBarGroup::TriggerToolboxLayout()
 // controlled via mbFormat. It seems the easiest way to get these
 // booleans set is to send in the fake event below.
 pParent-DataChanged( aFakeUpdate);
+// highest item in toolbar will have been calculated via the
+// event above. Call resize on InputBar to pick up the height
+// change
+pParent-Resize();
 // unlock relayouts the toolbars in the 4 quadrants
 xLayoutManager-unlock();
 }
@@ -1137,7 +1139,10 @@ void ScMultiTextWnd::SetNumLines( long nLines )
 {
 mnLines = nLines;
 if ( nLines  1 )
+{
 mnLastExpandedLines = nLines;
+Resize();
+}
 }
 
 void ScMultiTextWnd::Resize()
@@ -1161,6 +1166,7 @@ void ScMultiTextWnd::Resize()
 
 pEditEngine-SetPaperSize( PixelToLogic(Size((aOutputSize.Width()-= 2 
* nTextStartPos - 1), 1 ) ));
 }
+
 SetScrollBarRange();
 SetSizePixel(aTextBoxSize);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/nlpflatten' - 0 commits -

2011-11-28 Thread Michael Meeks

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sd/inc sd/source sfx2/inc sw/source

2011-11-28 Thread Caolán McNamara

 sd/inc/glob.hrc |1 -
 sd/source/core/glob.src |   36 +++-
 sd/source/ui/view/ViewShellBase.cxx |2 +-
 sfx2/inc/sfx2/objface.hxx   |4 ++--
 sw/source/ui/inc/shells.hrc |4 
 sw/source/ui/shells/shells.src  |8 
 6 files changed, 46 insertions(+), 9 deletions(-)

New commits:
commit ac07fe981912dfd435e571ae42d4c1980fd1cfe7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 28 11:16:14 2011 +

add defined but missing SfxInterface strings

diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 5d736a5..a3c5436 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -346,10 +346,44 @@ String STR_MEDIAOBJECTBARSHELL
 
 String STR_TABLEOBJECTBARSHELL
 {
-Text [ de ] = Tabelle ;
 Text [ en-US ] = Table ;
 };
 
+String STR_SLIDESORTERVIEWSHELL
+{
+Text [ en-US ] = Slide Sorter ;
+};
+
+String STR_TOOL_PANEL_SHELL
+{
+Text [ en-US ] = Tool Panel ;
+};
+
+String STR_LEFT_IMPRESS_PANE_SHELL
+{
+Text [ en-US ] = Slides ;
+};
+
+String STR_LEFT_DRAW_PANE_SHELL
+{
+Text [ en-US ] = Pages ;
+};
+
+String STR_TASKPANEVIEWSHELL
+{
+Text [ en-US ] = Tasks ;
+};
+
+String STR_MASTERPAGESSELECTOR
+{
+Text [ en-US ] = Master Pages ;
+};
+
+String STR_TASKPANELAYOUTMENU
+{
+Text [ en-US ] = Layout ;
+};
+
 String STR_POWERPOINT_IMPORT
 {
 Text [ en-US ] = PowerPoint Import;
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index 569dba2..6c3e409 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -94,10 +94,6 @@
 #define STR_REDLINE_EDIT(RC_SHELLS_BEGIN + 56)
 #define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57)
 
-// #i68101# no longer needed
-// #define STR_NAME_SHAPE_LABEL(RC_SHELLS_BEGIN + 58)
-// #define STR_NAME_SHAPE_DIALOG   (RC_SHELLS_BEGIN + 59)
-
 #define RID_MODULE_TOOLBOX  (RC_SHELLS_BEGIN + 60)
 
 #define RID_MEDIA_TOOLBOX   (RC_SHELLS_BEGIN + 61)
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index ad275b5..ee1f6ec 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -205,6 +205,14 @@ String STR_SHELLNAME_DRAW_TEXT
 {
 Text [ en-US ] = Draw text ;
 };
+String STR_SHELLNAME_MEDIA
+{
+Text [ en-US ] = Media ;
+};
+String STR_SHELLNAME_NAVIGATION
+{
+Text [ en-US ] = Navigation ;
+};
  //Strings fuer Gallery/Hintergrund
 String STR_SWBG_PARAGRAPH
 {
commit 55c5ea43a59e505297fb6fa20b77aaa28f7c67bc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 28 10:49:36 2011 +

there is no STR_VIEWSHELLBASE string

diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 89b2b67..4de2609 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -125,7 +125,6 @@
 #define STR_SAVE_DOCRID_GLOB_START+100
 #define STR_PREVIEWVIEWSHELLRID_GLOB_START+101
 #define RID_SD_ERRHDL   RID_GLOB_START+102
-#define STR_VIEWSHELLBASE   RID_GLOB_START+103
 #define STR_3DOBJECTBARSHELLRID_GLOB_START+104
 #define STR_FONTWORKOBJECTBARSHELL  RID_GLOB_START+105
 #define STR_SLIDESORTERVIEWSHELLRID_GLOB_START+106
diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 3f7094d..94ed8ff 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -261,7 +261,7 @@ void ViewShellBase::InitFactory()
 
 
 
-SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(STR_VIEWSHELLBASE))
+SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0))
 {
 }
 
commit 5d0051ac3733db9f04dd459db46212f70a9c07e9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 28 10:11:54 2011 +

SfxInterfaces may legally have no translatable ui name

diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 7e43c19..c4d38f2 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -80,9 +80,9 @@ public:
 const SfxSlot*  GetSlot( const String rCommand ) const;
 
 const char* GetClassName() const { return pName; }
-int HasName() const { return 0 != aNameResId.GetId(); }
+boolHasName() const { return 0 != aNameResId.GetId(); }
 rtl::OUString   GetName() const
-{ return String(aNameResId); }
+{ return HasName() ? ResId::toString(aNameResId) : 
rtl::OUString(); }
 ResMgr* GetResMgr() const
 { return aNameResId.GetResMgr(); }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Caolán McNamara

 solenv/gbuild/platform/unxgcc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc8a2861b473043956e01aeb60a0f419b8705255
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 28 12:09:29 2011 +

tidy up escaping so this works for me

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index c5c0324..fe2aa7e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -403,7 +403,7 @@ define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp`  \
 printf . $(OUTDIR)/installation/opt/program/ooenv\\n  $${OFFICESCRIPT}  \
 printf gdb $(OUTDIR)/installation/opt/program/soffice.bin  
$${OFFICESCRIPT}  \
-printf  -ex \set args --norestore --nologo 
\\\--accept=pipe,name=$(USER);urp;\\\ 
-env:UserInstallation=file://$(OUTDIR)/installation/\  $${OFFICESCRIPT}  \
+printf  -ex \set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' 
-env:UserInstallation=file://$(OUTDIR)/installation/\  $${OFFICESCRIPT}  \
 printf  -ex \r\\\n  $${OFFICESCRIPT}  \
 $(SHELL) $${OFFICESCRIPT}  \
 rm $${OFFICESCRIPT}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nlpsolver/prj

2011-11-28 Thread Michael Meeks

 nlpsolver/prj/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3915eb4ffef25b093b6880d35d1366ed61201979
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Nov 28 12:12:12 2011 +

add missing dmakefile to please gbuild

diff --git a/nlpsolver/prj/makefile.mk b/nlpsolver/prj/makefile.mk
new file mode 100644
index 000..0997622
--- /dev/null
+++ b/nlpsolver/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svl/CppunitTest_svl_lngmisc.mk

2011-11-28 Thread Michael Stahl

 svl/CppunitTest_svl_lngmisc.mk |8 
 1 file changed, 8 deletions(-)

New commits:
commit b1447d64662cdf9c7d8b11a9075cd13dfb800d4e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 28 14:29:27 2011 +0100

svl: remove unnecessary libs from cppunittest

diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index fc5dd45..5c38e41 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -34,19 +34,11 @@ svl/qa/unit/test_lngmisc \
 
 # add a list of all needed libraries here
 $(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \
-comphelper \
 cppu \
 cppuhelper \
 sal \
 salhelper \
-sb \
-sot \
 svl \
-svt \
-tl \
-utl \
-vcl \
-xcr \
 $(gb_STDLIBS) \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basic/source sdext/source vcl/unx writerfilter/source

2011-11-28 Thread Thorsten Behrens

 basic/source/sbx/sbxcurr.cxx |   10 +++---
 sdext/source/pdfimport/tree/imagecontainer.cxx   |   14 
 vcl/unx/gtk/app/gtkinst.cxx  |2 -
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx|2 -
 writerfilter/source/dmapper/ConversionHelper.cxx |   38 +++
 5 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 75dbef14bb484e018f9019c82b7bd9d54549401c
Author: Thorsten Behrens tbehr...@suse.com
Date:   Mon Nov 28 14:18:04 2011 +0100

Headless got moved, fix gtk3 build.

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index a16df25..f3f1343 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -611,7 +611,7 @@ GenPspGraphics *GtkInstance::CreatePrintGraphics()
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-#include ../../headless/svpinst.cxx
+#include ../../../headless/svpinst.cxx
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index cb84e15..1a9f5b9 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -28,7 +28,7 @@
 
 // Gross inclusion hacks for now ...
 
-#include ../../headless/svpgdi.cxx
+#include ../../../headless/svpgdi.cxx
 #include unx/gtk/gtkframe.hxx
 #include unx/gtk/gtkdata.hxx
 #include unx/gtk/gtkinst.hxx
commit 13673b71bc9936d4a8c97f86c7d6f4e713839b40
Author: August Sodora aug...@gmail.com
Date:   Sat Nov 26 02:03:23 2011 -0500

Remove uses of OUString::setCharAt

diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 5f2e89c..20a3968 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -85,13 +85,13 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 
rVal )
 for ( sal_Int32 charCpyIndex = aAbsStr.getLength() - 1; nInsertIndex = 
nEndIndex;  ++nDigitCount )
 {
 if ( nDigitCount == 4 )
-aBuf.setCharAt( nInsertIndex--, cDecimalSep );
+aBuf[nInsertIndex--] = cDecimalSep;
 #if MAYBEFUTURE
 if ( nDigitCount  4  ! ( ( nDigitCount - 4  ) % 3) )
-aBuf.setCharAt( nInsertIndex--, cThousandSep );
+aBuf[nInsertIndex--] = cThousandSep;
 #endif
 if ( nDigitCount  initialLen )
-aBuf.setCharAt( nInsertIndex--, aAbsStr[ charCpyIndex-- ] );
+aBuf[nInsertIndex--] = aAbsStr[ charCpyIndex-- ];
 else
 // Handle leading 0's to right of decimal point
 // Note: in VBA the stringification is a little more complex
@@ -104,10 +104,10 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 
rVal )
 // 0 0. 0
 // 0.1   0.1000 0.1
 
-aBuf.setCharAt( nInsertIndex--, (sal_Unicode)'0' );
+aBuf[nInsertIndex--] = (sal_Unicode)'0';
 }
 if ( isNeg )
-aBuf.setCharAt( nInsertIndex, (sal_Unicode)'-' );
+aBuf[nInsertIndex] = (sal_Unicode)'-';
 
 aAbsStr = aBuf.makeStringAndClear();
 return aAbsStr;
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx 
b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 921b573..d6ab304 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -73,16 +73,16 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, 
const sal_uInt32 i_nBuffe
 aBuf.appendAscii();
 
 sal_uInt8 nIndex (static_castsal_uInt8((nBinary  0xFC)  18));
-aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos] = aBase64EncodeTable [nIndex];
 
 nIndex = static_castsal_uInt8((nBinary  0x3F000)  12);
-aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+1] = aBase64EncodeTable [nIndex];
 
 nIndex = static_castsal_uInt8((nBinary  0xFC0)  6);
-aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+2] = aBase64EncodeTable [nIndex];
 
 nIndex = static_castsal_uInt8((nBinary  0x3F));
-aBuf.setCharAt(nBufPos+3, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+3] = aBase64EncodeTable [nIndex];
 }
 if( nRemain  0 )
 {
@@ -98,15 +98,15 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, 
const sal_uInt32 i_nBuffe
 break;
 }
 sal_uInt8 nIndex (static_castsal_uInt8((nBinary  0xFC)  18));
-aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos] = aBase64EncodeTable [nIndex];
 
 nIndex = static_castsal_uInt8((nBinary  0x3F000)  12);
-aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]);
+aBuf[nBufPos+1] = aBase64EncodeTable [nIndex];
 
 if( nRemain == 2 )
 {
 nIndex = static_castsal_uInt8((nBinary  0xFC0)  6);
-aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]);
+

[Libreoffice-commits] .: cui/source

2011-11-28 Thread Andras Timar

 cui/source/dialogs/colorpicker.cxx |6 --
 cui/source/dialogs/colorpicker.src |   13 +++--
 cui/source/dialogs/zoom.src|2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 6a8350377bbcc7e1bf9877ab71bf19510b0c0abe
Author: Andras Timar ati...@suse.com
Date:   Mon Nov 28 15:47:09 2011 +0100

no space between number and percent or degree mark - consistency

diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index 3f3110d..5ae4a10 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1151,12 +1151,6 @@ ColorPickerDialog::ColorPickerDialog( Window* pParent, 
sal_Int32 nColor, sal_Int
 {
 FreeResource();
 
-String sUnitText;
-sUnitText.Append( ' ' );
-sUnitText.Append( (sal_Unicode) 0xb0 );
-
-maMFHue.SetCustomUnitText( sUnitText );
-
 Link aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
 maColorField.SetModifyHdl( aLink );
 maColorSlider.SetModifyHdl( aLink );
diff --git a/cui/source/dialogs/colorpicker.src 
b/cui/source/dialogs/colorpicker.src
index b444f74..6fee862 100644
--- a/cui/source/dialogs/colorpicker.src
+++ b/cui/source/dialogs/colorpicker.src
@@ -312,6 +312,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 360 ;
 Last = 360 ;
 Unit = FUNIT_CUSTOM ;
+CustomUnitText = Â° ;
 };
 
 FixedText CT_SATURATION
@@ -333,7 +334,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_BRIGHTNESS
@@ -355,7 +356,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 // -
@@ -388,7 +389,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_MAGENTA
@@ -410,7 +411,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_YELLOW
@@ -432,7 +433,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_KEY
@@ -454,7 +455,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 // --
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index f96323a..26729fa 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -71,7 +71,7 @@ ModalDialog RID_SVXDLG_ZOOM
 HelpID = cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100;
 Pos = MAP_APPFONT ( 12 , 53 ) ;
 Size = MAP_APPFONT ( 105, 10 ) ;
-Text = ~100 % ;
+Text = ~100% ;
 };
 RadioButton BTN_USER
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - dbaccess/source

2011-11-28 Thread Thorsten Behrens

 dbaccess/source/ui/dlg/ConnectionHelper.cxx |2 +-
 dbaccess/source/ui/dlg/makefile.mk  |6 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit e86982ad35010aa52375b6949eecb2b742e6485f
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Nov 24 19:01:22 2011 +0100

fdo#32347: reenable ADO URL helper UI

cleanup obsolete DISABLE_ADO logic

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 3b70cbe..da2af7e 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -70,7 +70,7 @@
 #include tools/urlobj.hxx
 #include tools/diagnose_ex.h
 #include sfx2/docfilt.hxx
-#if !defined(WINDOWS_VISTA_PSDK)  defined(WNT)
+#if defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/makefile.mk 
b/dbaccess/source/ui/dlg/makefile.mk
index 8fa615d..55f9027 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -128,11 +128,7 @@ SLOFILES=  \
 $(EXCEPTIONSFILES) \
 $(SLO)$/optionalboolitem.obj 
 
-.IF $(WINDOWS_VISTA_PSDK)!=  $(PROF_EDITION)==
-DISABLE_ADO=TRUE
-.ENDIF # $(WINDOWS_VISTA_PSDK)!=  $(PROF_EDITION)==
-
-.IF $(GUI)==WNT  $(DISABLE_ADO)==
+.IF $(GUI)==WNT
 SLOFILES+= $(SLO)$/adodatalinks.obj
 .ENDIF
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nlpsolver/src

2011-11-28 Thread Michael Meeks

 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb |   13 ++
 1 file changed, 13 insertions(+)

New commits:
commit 959d4ceac805d78142ace304f367fa0919359b3f
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Nov 28 15:49:00 2011 +

nlpsolver: add missing passive registration rdb

diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb
new file mode 100644
index 000..151ec5e
--- /dev/null
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb
@@ -0,0 +1,13 @@
+?xml version=1.0?
+components xmlns=http://openoffice.org/2010/uno-components;
+component loader=com.sun.star.loader.Java2 uri=./nlpsolver.jar
+implementation name=com.sun.star.comp.Calc.NLPSolver.DEPSSolverImpl
+service name=com.sun.star.beans.PropertySet/
+service name=com.sun.star.sheet.Solver/
+/implementation
+implementation name=com.sun.star.comp.Calc.NLPSolver.SCOSolverImpl
+service name=com.sun.star.beans.PropertySet/
+service name=com.sun.star.sheet.Solver/
+/implementation
+/component
+/components
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/ru_RU.xml |   62 ++
 1 file changed, 62 insertions(+)

New commits:
commit c01ce861aced958302087117a5c5019d420b9d52
Author: Serg Bormant borm...@gmail.com
Date:   Mon Nov 28 17:18:10 2011 +0100

added [ru-RU] genitive case month names

diff --git a/i18npool/source/localedata/data/ru_RU.xml 
b/i18npool/source/localedata/data/ru_RU.xml
index 17405f6..fd64844 100644
--- a/i18npool/source/localedata/data/ru_RU.xml
+++ b/i18npool/source/localedata/data/ru_RU.xml
@@ -285,6 +285,68 @@
   DefaultFullNameÐÐµÐºÐ°Ð±ÑÑ/DefaultFullName
 /Month
   /MonthsOfYear
+  GenitiveMonths
+Month
+  MonthIDjan/MonthID
+  DefaultAbbrvNameÑÐ½Ð²/DefaultAbbrvName
+  DefaultFullNameÑÐ½Ð²Ð°ÑÑ/DefaultFullName
+/Month
+Month
+  MonthIDfeb/MonthID
+  DefaultAbbrvNameÑÐµÐ²/DefaultAbbrvName
+  DefaultFullNameÑÐµÐ²ÑÐ°Ð»Ñ/DefaultFullName
+/Month
+Month
+  MonthIDmar/MonthID
+  DefaultAbbrvNameÐ¼Ð°Ñ/DefaultAbbrvName
+  DefaultFullNameÐ¼Ð°ÑÑÐ°/DefaultFullName
+/Month
+Month
+  MonthIDapr/MonthID
+  DefaultAbbrvNameÐ°Ð¿Ñ/DefaultAbbrvName
+  DefaultFullNameÐ°Ð¿ÑÐµÐ»Ñ/DefaultFullName
+/Month
+Month
+  MonthIDmay/MonthID
+  DefaultAbbrvNameÐ¼Ð°Ð¹/DefaultAbbrvName
+  DefaultFullNameÐ¼Ð°Ñ/DefaultFullName
+/Month
+Month
+  MonthIDjun/MonthID
+  DefaultAbbrvNameÐ¸ÑÐ½/DefaultAbbrvName
+  DefaultFullNameÐ¸ÑÐ½Ñ/DefaultFullName
+/Month
+Month
+  MonthIDjul/MonthID
+  DefaultAbbrvNameÐ¸ÑÐ»/DefaultAbbrvName
+  DefaultFullNameÐ¸ÑÐ»Ñ/DefaultFullName
+/Month
+Month
+  MonthIDaug/MonthID
+  DefaultAbbrvNameÐ°Ð²Ð³/DefaultAbbrvName
+  DefaultFullNameÐ°Ð²Ð³ÑÑÑÐ°/DefaultFullName
+/Month
+Month
+  MonthIDsep/MonthID
+  DefaultAbbrvNameÑÐµÐ½/DefaultAbbrvName
+  DefaultFullNameÑÐµÐ½ÑÑÐ±ÑÑ/DefaultFullName
+/Month
+Month
+  MonthIDoct/MonthID
+  DefaultAbbrvNameÐ¾ÐºÑ/DefaultAbbrvName
+  DefaultFullNameÐ¾ÐºÑÑÐ±ÑÑ/DefaultFullName
+/Month
+Month
+  MonthIDnov/MonthID
+  DefaultAbbrvNameÐ½Ð¾Ñ/DefaultAbbrvName
+  DefaultFullNameÐ½Ð¾ÑÐ±ÑÑ/DefaultFullName
+/Month
+Month
+  MonthIDdec/MonthID
+  DefaultAbbrvNameÐ´ÐµÐº/DefaultAbbrvName
+  DefaultFullNameÐ´ÐµÐºÐ°Ð±ÑÑ/DefaultFullName
+/Month
+  /GenitiveMonths
   Eras
 Era
   EraIDbc/EraID
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nlpsolver/prj

2011-11-28 Thread Michael Meeks

 nlpsolver/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8eca6b52b82e04654a5a3245b0578c2e04a26740
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Nov 28 16:29:39 2011 +

add missing dep. to generate LICENSE

diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst
index 8d0edca..d496bc8 100644
--- a/nlpsolver/prj/build.lst
+++ b/nlpsolver/prj/build.lst
@@ -1,2 +1,2 @@
-nlpsolver  nlpsolver   :   javaunohelper unoil jurt NULL
+nlpsolver  nlpsolver   :   javaunohelper unoil jurt readlicense_oo 
NULL
 nlpsolver   nlpsolver\prj   nmake   -   all nlp_prj NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/ast_ES.xml |   36 ++---
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 56a6704509bd24ac699d9ee9e4c430225f1b07cd
Author: Xuacu Saturio xuacu...@gmail.com
Date:   Mon Nov 28 17:34:52 2011 +0100

changed [ast-ES] date and currency formats

diff --git a/i18npool/source/localedata/data/ast_ES.xml 
b/i18npool/source/localedata/data/ast_ES.xml
index 1c2b5e5..e83257d 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -21,7 +21,7 @@
   ListSeparator;/ListSeparator
   LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator
   LongDateDaySeparator /LongDateDaySeparator
-  LongDateMonthSeparator /LongDateMonthSeparator
+  LongDateMonthSeparator de /LongDateMonthSeparator
   LongDateYearSeparator /LongDateYearSeparator
 /Separators
 Markers
@@ -66,28 +66,28 @@
   FormatCode0,00%/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY formatindex=12
-  FormatCode[CURRENCY]#.##0;-[CURRENCY]#.##0/FormatCode
+  FormatCode#.##0[CURRENCY];-#.##0[CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY formatindex=13
-  FormatCode[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00/FormatCode
+  FormatCode#.##0,00[CURRENCY];-#.##0,00[CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY formatindex=14
-  FormatCode[CURRENCY]#.##0;[RED]-[CURRENCY]#.##0/FormatCode
+  FormatCode#.##0[CURRENCY];[RED]-#.##0[CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY formatindex=15
-  FormatCode[CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00/FormatCode
+  FormatCode#.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey5 default=false type=medium 
usage=CURRENCY formatindex=16
   FormatCodeCCC#.##0,00/FormatCode
 /FormatElement
 FormatElement msgid=CurrencyFormatskey6 default=false type=medium 
usage=CURRENCY formatindex=17
-  FormatCode[CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--/FormatCode
+  FormatCode#.##0,--[CURRENCY];[RED]-#.##0,--[CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey11 default=true type=short 
usage=DATE formatindex=18
   FormatCodeD/MM/YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey14 default=true type=long 
usage=DATE formatindex=19
-  FormatCodeDD,  /FormatCode
+  FormatCodeDD  de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey6 default=true type=medium 
usage=DATE formatindex=20
   FormatCodeDD/MM/YY/FormatCode
@@ -96,34 +96,34 @@
   FormatCodeDD/MM//FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey15 default=false type=long 
usage=DATE formatindex=22
-  FormatCodeD, MMM YY/FormatCode
+  FormatCodeD MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey16 default=false type=long 
usage=DATE formatindex=23
-  FormatCodeD, MMM /FormatCode
+  FormatCodeD MMM de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey21 default=false type=long 
usage=DATE formatindex=24
-  FormatCodeD, MMM /FormatCode
+  FormatCodeD MMM de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey17 default=false type=long 
usage=DATE formatindex=25
-  FormatCodeD,  /FormatCode
+  FormatCodeD  de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey22 default=false type=long 
usage=DATE formatindex=26
-  FormatCodeD,  YY/FormatCode
+  FormatCodeD  YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey10 default=false type=medium 
usage=DATE formatindex=27
   FormatCodeNN, DD/MMM/YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey18 default=false type=long 
usage=DATE formatindex=28
-  FormatCodeNN, D, MMM YY/FormatCode
+  FormatCodeNN, D MMM YY/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey19 default=false type=long 
usage=DATE formatindex=29
-  FormatCodeNN, D,  /FormatCode
+  FormatCodeNN, D  de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey20 default=false type=long 
usage=DATE formatindex=30
-  FormatCodeD,  /FormatCode
+  FormatCodeD  de /FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey12 default=false type=short 
usage=DATE formatindex=31
-  FormatCodeMM/DD/FormatCode
+  FormatCodeDD/MM/FormatCode
 /FormatElement
 FormatElement msgid=DateFormatskey7 default=false type=medium 
usage=DATE

[Libreoffice-commits] .: svx/source

2011-11-28 Thread Michael Meeks

 svx/source/svdraw/svdglue.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 59df2942aec0fd8123b15799c6375abc83b9937e
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Nov 28 16:48:17 2011 +

correct gluepoint sizing to match new 9x9 glue-points (thanks to Astron)

diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index eac2430..69bd69c 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -32,7 +32,7 @@
 #include svx/svdobj.hxx
 #include svx/svdtrans.hxx
 
-
+static const Size aGlueHalfSize(4,4);
 
 void SdrGluePoint::SetReallyAbsolute(bool bOn, const SdrObject rObj)
 {
@@ -250,10 +250,13 @@ void SdrGluePoint::Invalidate(Window rWin, const 
SdrObject* pObj) const
 Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
 aPt=rWin.LogicToPixel(aPt);
 rWin.EnableMapMode(sal_False);
-long x=aPt.X(),y=aPt.Y(); // Size fixed to 7 pixels for now
+
+Size aSiz( aGlueHalfSize );
+Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),
+aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height());
 
 // do not erase background, that causes flicker (!)
-rWin.Invalidate(Rectangle(Point(x-3,y-3),Point(x+3,y+3)), 
INVALIDATE_NOERASE);
+rWin.Invalidate(aRect, INVALIDATE_NOERASE);
 
 rWin.EnableMapMode(bMapMerk);
 }
@@ -261,7 +264,7 @@ void SdrGluePoint::Invalidate(Window rWin, const 
SdrObject* pObj) const
 bool SdrGluePoint::IsHit(const Point rPnt, const OutputDevice rOut, const 
SdrObject* pObj) const
 {
 Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
-Size aSiz=rOut.PixelToLogic(Size(3,3));
+Size aSiz=rOut.PixelToLogic(aGlueHalfSize);
 Rectangle 
aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height());
 return aRect.IsInside(rPnt);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sax/source

2011-11-28 Thread Radek Doulík

 sax/source/tools/converter.cxx |   43 +
 1 file changed, 43 insertions(+)

New commits:
commit f970963fd7438fe4a026febf2046a2f4430d0a9f
Author: Radek Doulik r...@novell.com
Date:   Mon Nov 28 17:50:25 2011 +0100

added conversion from MeasureUnit::CM

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index e9a08c4..198ea4d 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1966,6 +1966,49 @@ double 
Converter::GetConversionFactor(::rtl::OUStringBuffer rUnit, sal_Int16 nS
 }
 break;
 }
+case MeasureUnit::CM:
+{
+switch(nTargetUnit)
+{
+case MeasureUnit::MM_100TH:
+{
+fRetval = .001;
+break;
+}
+case MeasureUnit::MM_10TH:
+{
+fRetval = .01;
+break;
+}
+case MeasureUnit::MM:
+{
+fRetval = .1;
+psUnit = gpsMM;
+break;
+}
+case MeasureUnit::CM:
+{
+break;
+}
+case MeasureUnit::POINT:
+{
+// 0.01pt = 0.35 mm/100 (exactly)
+fRetval = 2.54 / 72.0;
+psUnit = gpsPT;
+break;
+}
+case MeasureUnit::INCH:
+default:
+{
+OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, output 
unit not supported for cm values);
+// 0.0001in = 0.254 mm/100 (exactly)
+fRetval = 2.54;
+psUnit = gpsINCH;
+break;
+}
+}
+break;
+}
 default:
 OSL_ENSURE(false, sax::Converter::GetConversionFactor(): 
 source unit not supported);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[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] .: 5 commits - Makefile.in solenv/gbuild tail_build/Makefile

2011-11-28 Thread Bjoern Michaelsen

 Makefile.in |  165 +++-
 solenv/gbuild/Module.mk |   48 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |   77 +++
 solenv/gbuild/extensions/post_BuildplTargets.mk |   76 +++
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   38 +
 solenv/gbuild/gbuild.mk |2 
 tail_build/Makefile |2 
 7 files changed, 281 insertions(+), 127 deletions(-)

New commits:
commit ce33bdce9d3499b7419b9210a2b5117ccda7ea32
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 17:56:11 2011 +0100

targets must be postextension SRCDIR is empty otherwise

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
new file mode 100644
index 000..fff1c10
--- /dev/null
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -0,0 +1,77 @@
+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+#  
+#   Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#  
+#   The contents of this file are subject to the Mozilla Public License Version
+#   1.1 (the License); you may not use this file except in compliance with
+#   the License or as specified alternatively below. You may obtain a copy of
+#   the License at http://www.mozilla.org/MPL/
+#  
+#   Software distributed under the License is distributed on an AS IS basis,
+#   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+#   for the specific language governing rights and limitations under the
+#   License.
+#  
+#   Major Contributor(s):
+#   [ Copyright (C) 2011 Bjoern Michaelsen bjoern.michael...@canonical.com 
(initial developer) ]
+#  
+#   All Rights Reserved.
+#  
+#   For minor contributions see the git repository.
+#  
+#   Alternatively, the contents of this file may be used under the terms of
+#   either the GNU General Public License Version 3 or later (the GPLv3+), or
+#   the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+#   in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+#   instead of those above.
+
+.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap
+
+id:
+   @create-ids
+
+tags:
+   @create-tags
+
+docs:
+   @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+distro-pack-install: install
+   $(SRCDIR)/bin/distro-install-clean-up
+   $(SRCDIR)/bin/distro-install-desktop-integration
+   $(SRCDIR)/bin/distro-install-sdk
+   $(SRCDIR)/bin/distro-install-file-lists
+
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+   @$(SRCDIR)/download $(SRCDIR)/ooo.lst  touch $@
+
+fetch: $(SRCDIR)/src.downloaded
+
+$(WORKDIR)/bootstrap:
+   @cd $(SRCDIR)  ./bootstrap
+   @mkdir -p $(dir $@)  touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+
+clean-host:
+   rm -rf $(SRCDIR)/*/$(INPATH)
+   rm -rf install
+
+clean-build:
+   if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
+   rm -f solenv/*/bin/dmake*
+   rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD)
+
+distclean: clean
+   if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
+   cd $(SRCDIR)  rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun 
autom4te.cache \
+   bin/repo-list build_env config.log config.status configure \
+   desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+   set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
+
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 6c62649..1fa6a2b 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -42,7 +42,34 @@ unitcheck: dev-install
@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
 
 all:
-   
+
+ifeq ($(filter-out build,$(MAKECMDGOALS)),)
+gb_MAKETARGET=build
+else
+gb_MAKETARGET=all
+endif
+
+define gb_BuildplTarget_command
+cd $(SRCDIR)/$(1)  unset MAKEFLAGS  $(SOLARENV)/bin/build.pl --all 
gb_MAKETARGET=$(gb_MAKETARGET)
+endef
+
+.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
+
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+   $(call gb_BuildplTarget_command,$@)
+
+dev-install: smoketestoo_native
+
+all: instsetoo_native
+
+build: instsetoo_native
+
 endif

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92d68ce31ab351905e5411a523a557ea658b9802
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 19:42:21 2011 +0100

source build env for crosscompiles

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cba5b33..0dcc15a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -62,7 +62,7 @@ instsetoo_native: $(WORKDIR)/bootstrap 
$(SRCDIR)/src.downloaded $(if $(filter $(
$(call gb_BuildplTarget_command,$@)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-   $(call gb_BuildplTarget_command,$@)
+   source $(SRCDIR)/Env.Build.sh  $(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/locale.dtd |4 
 1 file changed, 4 insertions(+)

New commits:
commit 281d8e3ab8689a24f21f0dfd6d4de2ca1d46dc34
Author: Eike Rathke er...@redhat.com
Date:   Mon Nov 28 20:03:14 2011 +0100

non-preset formatindex=... values must be =50

Explicitly mention that formatindex=... values for formats defined
additionally to the preset range must be =50 and unique within a
locale.

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index ff88bfd..aca66e5 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -198,6 +198,10 @@
 This isn't necessary to be technically correct and isn't done in many
 locales yet, but will certainly help.
 
+If you want to define yet more formats than the preset and reserved
+0..49 range that's fine, only make sure those formatindex=... values
+are each =50 and all values are unique within one locale.
+
 Of usage=FIXED_NUMBER:
 formatindex=0 MUST be the format containing the 'General' keyword.
 The keyword itself may be localized, it is good practice though to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source nlpsolver/src

2011-11-28 Thread Andras Timar

 l10ntools/source/localize.cxx  |1 +
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a969d2aa5d38a501887d51995b817ed6f941c743
Author: Andras Timar ati...@suse.com
Date:   Mon Nov 28 20:39:39 2011 +0100

enable l10n of nlpsolver

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 4969ba9..41f55eb 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -135,6 +135,7 @@ const char *ModuleList[] = {
 helpcontent2,
 instsetoo_native,
 mysqlc,
+nlpsolver,
 officecfg,
 padmin,
 readlicense_oo,
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
index 45fdbd8..9289756 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml
@@ -4,13 +4,13 @@
 version value=0.9/
 identifier value=com.sun.star.comp.Calc.NLPSolver/
 display-name
-name lang=enSolver for Nonlinear Programming/name
+name lang=en-USSolver for Nonlinear Programming/name
 /display-name
 publisher
-name lang=en xlink:href=http://www.documentfoundation.org;The 
Document Foundation/name
+name lang=en-US xlink:href=http://www.documentfoundation.org;The 
Document Foundation/name
 /publisher
 extension-description
-src lang=en xlink:href=description-en-US.txt/
+src lang=en-US xlink:href=description-en-US.txt/
 /extension-description
 dependencies
 OpenOffice.org-minimal-version 
xmlns:d=http://openoffice.org/extensions/description/2006; 
d:name=OpenOffice.org 3.0 value=3.0/
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/gd_GB.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ceb55cd688cebede8cef8408540019fe54528869
Author: Michael Bauer f...@akerbeltz.org
Date:   Mon Nov 28 20:37:54 2011 +0100

[gd-GB] partitive vs genitive case month names

diff --git a/i18npool/source/localedata/data/gd_GB.xml 
b/i18npool/source/localedata/data/gd_GB.xml
index b08f61e..095cbe6 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -347,7 +347,7 @@
 DefaultFullNameDÃ¹bhlachd/DefaultFullName
 /Month
 /MonthsOfYear
-GenitiveMonths
+PartitiveMonths
 Month
 MonthIDjan/MonthID
 DefaultAbbrvNameFaoi/DefaultAbbrvName
@@ -408,7 +408,7 @@
 DefaultAbbrvNameDÃ¹bh/DefaultAbbrvName
 DefaultFullNamedhen DÃ¹bhlachd/DefaultFullName
 /Month
-/GenitiveMonths
+/PartitiveMonths
 Eras
 Era
 EraIDbc/EraID
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 70324f1e66bf64882d5ffc0b9215aa5524dc2e23
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 21:09:51 2011 +0100

dont overoptimize a plain make without an explicit target

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 1ac06ee..7e1a640 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,12 +27,14 @@
 
 
 # speed up if no target need to parse all modules
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out id tags docs distro-pack-install fetch help 
debugrun,$(MAKECMDGOALS)),)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - nlpsolver/help nlpsolver/src

2011-11-28 Thread Andras Timar

 nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp   |5 
++---
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt |2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 837711466e06648eca2152da9bd0cccfd672c6f0
Author: Andras Timar ati...@suse.com
Date:   Mon Nov 28 21:38:05 2011 +0100

remove CR/LF linefeed from description

diff --git 
a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
index 5a9fbed..9288dcf 100755
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description-en-US.txt
@@ -1,2 +1 @@
-This extension integrates into Calc and offers new Solver engines
-to use for optimizing nonlinear programming models.
\ No newline at end of file
+This extension integrates into Calc and offers new Solver engines to use for 
optimizing nonlinear programming models.
commit 9fce330f8f47a148bc12413540a80696cb90a0b4
Author: Andras Timar ati...@suse.com
Date:   Mon Nov 28 21:35:57 2011 +0100

eliminate duplicate IDs

diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp 
b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
index bbe5888..af4ecd4 100755
--- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
+++ b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
@@ -97,7 +97,7 @@
  /tablerow
  tablerow
 tablecell
-   paragraph xml-lang=en-US id=par_id0503200917103794 
role=tablecontent l10n=NEWStagnation Limit/paragraph
+   paragraph xml-lang=en-US id=par_id0504200917103794 
role=tablecontent l10n=NEWStagnation Limit/paragraph
 /tablecell
 tablecell
paragraph xml-lang=en-US id=par_id050320091710377 
role=tablecontent l10n=NEWIf this number of individuals found solutions 
within a close range, the iteration is stopped and the best of these values is 
chosen as optimal./paragraph
@@ -165,7 +165,7 @@
  /tablerow
  tablerow
 tablecell
-   paragraph xml-lang=en-US id=par_id0603200910394232 
role=tablecontent l10n=NEWPS: Social Constant/paragraph
+   paragraph xml-lang=en-US id=par_id0603200910394292 
role=tablecontent l10n=NEWPS: Social Constant/paragraph
 /tablecell
 tablecell
paragraph xml-lang=en-US id=par_id0603200910394284 
role=tablecontent l10n=NEWâ¦ sets the importance of the global best point 
between all particles/individuals./paragraph
@@ -194,4 +194,4 @@
   /table
 
/body
-/helpdocument
\ No newline at end of file
+/helpdocument
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - android/examples sal/osl

2011-11-28 Thread Tor Lillqvist

 android/examples/DocumentLoader/AndroidManifest.xml
  |   18 +
 
android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |   97 ++
 sal/osl/android/Makefile   
  |   25 +-
 sal/osl/android/jni/lo-bootstrap.c 
  |   51 +++--
 sal/osl/android/src/org/libreoffice/android/Bootstrap.java 
  |   42 ++--
 5 files changed, 187 insertions(+), 46 deletions(-)

New commits:
commit 3ad35cbadbed5c8cf2d2bbcccd154768a5a62b34
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Nov 29 01:24:01 2011 +0200

Android hacking

Start of an app to just load some document. Uses API from the
org.libreoffice.android.Bootstrap class.

Not sure what is the sanest way to build an app like this. It needs a
bunch of shared libraries of course to be copied into libs/armeabi-v7a
so that they get included in the .apk. Perhaps a Makefile similar to
the one for lo-bootstrap might be good?

But for debugging the Java code Eclipse is the way to go (?), and to
be able to do that Eclipse wants a project. So should this then be
built only through Eclipse? Can one build Eclipse projects from the
command line?

diff --git a/android/examples/DocumentLoader/AndroidManifest.xml 
b/android/examples/DocumentLoader/AndroidManifest.xml
new file mode 100644
index 000..c137311
--- /dev/null
+++ b/android/examples/DocumentLoader/AndroidManifest.xml
@@ -0,0 +1,18 @@
+?xml version=1.0 encoding=utf-8?
+manifest xmlns:android=http://schemas.android.com/apk/res/android;
+  package=org.libreoffice.android.examples
+  android:versionCode=1
+  android:versionName=1.0
+uses-sdk android:minSdkVersion=9 /
+application android:label=@string/app_name
+ android:debuggable=true
+activity android:name=.DocumentLoader
+  android:label=LO DocumentLoader
+  android:configChanges=orientation|keyboardHidden
+intent-filter
+action android:name=android.intent.action.MAIN /
+category android:name=android.intent.category.LAUNCHER /
+/intent-filter
+/activity
+/application
+/manifest
diff --git 
a/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
new file mode 100644
index 000..41f69dd
--- /dev/null
+++ 
b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -0,0 +1,97 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+// Version: MPL 1.1 / GPLv3+ / LGPLv3+
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the License); you may not use this file except in compliance with
+// the License or as specified alternatively below. You may obtain a copy of
+// the License at http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an AS IS basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// Major Contributor(s):
+// Copyright (C) 2011 Tor Lillqvist t...@iki.fi (initial developer)
+// Copyright (C) 2011 SUSE Linux http://suse.com (initial developer's employer)
+//
+// All Rights Reserved.
+//
+// For minor contributions see the git repository.
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 3 or later (the GPLv3+), or
+// the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+// in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+// instead of those above.
+
+package org.libreoffice.android.examples;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.sun.star.uno.UnoRuntime;
+
+import org.libreoffice.android.Bootstrap;
+
+public class DocumentLoader
+extends Activity {
+
+@Override
+public void onCreate(Bundle savedInstanceState)
+{
+super.onCreate(savedInstanceState);
+
+try {
+
+Thread.sleep(2);
+
+Bootstrap.setup(this);
+
+Bootstrap.dlopen(libjuh.so);
+
+com.sun.star.uno.XComponentContext xContext = null;
+
+xContext = 
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
+
+com.sun.star.lang.XMultiComponentFactory xMCF =
+xContext.getServiceManager();
+
+

[Libreoffice-commits] .: writerfilter/source

2011-11-28 Thread Miklos Vajna

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 61edefc8c862c94750e172c3f7d7b86379a2b862
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Nov 29 00:54:28 2011 +0100

remove debug printf

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1a138c0..f3d56c9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3206,7 +3206,6 @@ void RTFDocumentImpl::checkUnicode()
 {
 if (m_aUnicodeBuffer.getLength()  0)
 {
-OSL_TRACE(debug, sending collected unicode chars);
 OUString aString = m_aUnicodeBuffer.makeStringAndClear();
 text(aString);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2011-11-28 Thread Lior Kaplan

 cui/source/dialogs/about.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a0e84426bfab5787abda96162fe1d06d4a2ec38
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Tue Nov 29 01:58:28 2011 +0200

credits.html redirects to about-us/credits/, lets not depend on a rewrite 
rule in the website

diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 5ad35ac..8ee4862 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -94,7 +94,7 @@ ModalDialog RID_DEFAULTABOUT
 };
 String ABOUT_STR_LINK
 {
-Text[ en-US ] = http://www.libreoffice.org/credits.html;;
+Text[ en-US ] = http://www.libreoffice.org/about-us/credits/;;
 };
 String ABOUT_STR_BUILD
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-28 Thread August Sodora

 basctl/source/basicide/localizationmgr.cxx |   14 +++---
 basctl/source/inc/localizationmgr.hxx  |8 
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a82a87315033e416d267242002b6722051deb8a4
Author: August Sodora aug...@gmail.com
Date:   Mon Nov 28 22:16:47 2011 -0500

String-OUString

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index d6cd053..cf034d8 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -50,7 +50,7 @@ static ::rtl::OUString aSemi( RTL_CONSTASCII_USTRINGPARAM( 
; ));
 
 
 LocalizationMgr::LocalizationMgr( BasicIDEShell* pIDEShell,
-const ScriptDocument rDocument, String aLibName,
+const ScriptDocument rDocument, ::rtl::OUString aLibName,
 const Reference XStringResourceManager  xStringResourceManager )
 : m_xStringResourceManager( xStringResourceManager )
 , m_pIDEShell( pIDEShell )
@@ -927,8 +927,8 @@ void 
LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
 BasicIDE::MarkDocumentModified( aDocument );
 }
 
-void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 static ::rtl::OUString aResourceResolverPropName( 
RTL_CONSTASCII_USTRINGPARAM( ResourceResolver ));
 
@@ -959,8 +959,8 @@ void LocalizationMgr::setStringResourceAtDialog( const 
ScriptDocument rDocument
 }
 }
 
-void LocalizationMgr::renameStringResourceIDs( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::renameStringResourceIDs( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 // Get library
 Reference container::XNameContainer  xDialogLib( rDocument.getLibrary( 
E_DIALOGS, aLibName, sal_True ) );
@@ -990,8 +990,8 @@ void LocalizationMgr::renameStringResourceIDs( const 
ScriptDocument rDocument,
 }
 }
 
-void LocalizationMgr::removeResourceForDialog( const ScriptDocument 
rDocument, const String aLibName,
-const String aDlgName, Reference container::XNameContainer  
xDialogModel )
+void LocalizationMgr::removeResourceForDialog( const ScriptDocument 
rDocument, const ::rtl::OUString aLibName,
+const ::rtl::OUString aDlgName, Reference container::XNameContainer  
xDialogModel )
 {
 // Get library
 Reference container::XNameContainer  xDialogLib( rDocument.getLibrary( 
E_DIALOGS, aLibName, sal_True ) );
diff --git a/basctl/source/inc/localizationmgr.hxx 
b/basctl/source/inc/localizationmgr.hxx
index 6942b8e..67a0131 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -75,7 +75,7 @@ class LocalizationMgr
 void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode 
eMode );
 
 public:
-LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument 
rDocument, String aLibName,
+LocalizationMgr( BasicIDEShell* pIDEShell, const ScriptDocument 
rDocument, ::rtl::OUString aLibName,
 const ::com::sun::star::uno::Reference
  ::com::sun::star::resource::XStringResourceManager  
xStringResourceManager );
 ::com::sun::star::uno::Reference
@@ -111,13 +111,13 @@ public:
 static void deleteControlResourceIDsForDeletedEditorObject( DlgEditor* 
pEditor,
 ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString 
aCtrlName );
 
-static void setStringResourceAtDialog( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void setStringResourceAtDialog( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
-static void renameStringResourceIDs( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void renameStringResourceIDs( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
-static void removeResourceForDialog( const ScriptDocument rDocument, 
const String aLibName, const String aDlgName,
+static void removeResourceForDialog( const ScriptDocument rDocument, 
const ::rtl::OUString aLibName, const ::rtl::OUString aDlgName,
 ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  xDialogModel );
 
 static

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Thorsten Behrens

 configure.in |  111 ++-
 1 file changed, 80 insertions(+), 31 deletions(-)

New commits:
commit 9c31884d929f837695f3ed0a2ead8c5aea900ec7
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Nov 29 05:50:51 2011 +0100

Make branding bulk-configurable.

diff --git a/configure.in b/configure.in
index 3977d7f..4bb2f1f 100644
--- a/configure.in
+++ b/configure.in
@@ -1591,6 +1591,16 @@ dnl 
===
 dnl Branding
 dnl ===
 
+AC_ARG_WITH(branding,
+[  --with-brandingUse given path to retrieve all branding images.
+  Expects /path/intro.png ...
+  /path/backing_rtl_right.png to be there. Individual
+  images can be overridden via --with-intro-bitmap ...
+  --with-startcenter-rtl-left-bitmap switches.
+
+  Usage: --with-branding=/path/to/images
+],,)
+
 AC_ARG_WITH(intro-bitmap,
 [  --with-intro-bitmapPrefer the specified intro bitmap over the
   the default one.
@@ -9224,20 +9234,6 @@ if test -n ${GIT_LINK_SRC}; then
 fi
 AC_SUBST(GIT_LINK_SRC)
 
-AC_MSG_CHECKING([for another 'intro' bitmap])
-INTRO_BITMAP=
-if test -z $with_intro_bitmap -o $with_intro_bitmap = no ; then
-INTRO_BITMAP=
-AC_MSG_RESULT([none])
-else
-case $with_intro_bitmap in
-*.png) INTRO_BITMAP=$with_intro_bitmap ;;
-*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
-esac
-AC_MSG_RESULT([$INTRO_BITMAP])
-fi
-AC_SUBST(INTRO_BITMAP)
-
 AC_MSG_CHECKING([for custom 'intro' progress bar color])
 PROGRESSBARCOLOR=
 if test -z $with_intro_progressbar_color ; then
@@ -9282,10 +9278,58 @@ else
 fi
 AC_SUBST(PROGRESSFRAMECOLOR)
 
-AC_MSG_CHECKING([for another 'about' bitmap])
+AC_MSG_CHECKING([for alternative branding images directory])
+INTRO_BITMAP=
 ABOUT_BITMAP=
+STARTCENTER_LEFT_BITMAP=
+STARTCENTER_RIGHT_BITMAP=
+STARTCENTER_RTL_LEFT_BITMAP=
+STARTCENTER_RTL_RIGHT_BITMAP=
+STARTCENTER_SPACE_BITMAP=
+if test -z $with_branding -o $with_branding = no ; then
+AC_MSG_RESULT([none])
+else
+INTRO_BITMAP=$with_branding/intro.png
+ABOUT_BITMAP=$with_branding/about.png
+STARTCENTER_LEFT_BITMAP=$with_branding/backing_left.png
+STARTCENTER_RIGHT_BITMAP=$with_branding/backing_right.png
+STARTCENTER_RTL_LEFT_BITMAP=$with_branding/backing_rtl_left.png
+STARTCENTER_RTL_RIGHT_BITMAP=$with_branding/backing_rtl_right.png
+STARTCENTER_SPACE_BITMAP=$with_branding/backing_space.png
+for i in $INTRO_BITMAP \
+ $ABOUT_BITMAP \
+ $STARTCENTER_LEFT_BITMAP \
+ $STARTCENTER_RIGHT_BITMAP \
+ $STARTCENTER_RTL_LEFT_BITMAP \
+ $STARTCENTER_RTL_RIGHT_BITMAP \
+ $STARTCENTER_SPACE_BITMAP; do
+if test ! -f $i; then
+AC_MSG_WARN([Required file $i does not exist!])
+fi
+done
+AC_MSG_RESULT([$with_branding])
+fi
+
+AC_MSG_CHECKING([for yet another 'intro' bitmap])
+if test -z $with_intro_bitmap -o $with_intro_bitmap = no ; then
+if test $with_intro_bitmap = no ; then
+INTRO_BITMAP=
+fi
+AC_MSG_RESULT([none])
+else
+case $with_intro_bitmap in
+*.png) INTRO_BITMAP=$with_intro_bitmap ;;
+*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+esac
+AC_MSG_RESULT([$INTRO_BITMAP])
+fi
+AC_SUBST(INTRO_BITMAP)
+
+AC_MSG_CHECKING([for yet another 'about' bitmap])
 if test -z $with_about_bitmap -o $with_about_bitmap = no ; then
-ABOUT_BITMAP=
+if test $with_about_bitmap = no ; then
+ABOUT_BITMAP=
+fi
 AC_MSG_RESULT([none])
 else
case $with_about_bitmap in
@@ -9296,10 +9340,11 @@ else
 fi
 AC_SUBST(ABOUT_BITMAP)
 
-AC_MSG_CHECKING([for another 'start center left' bitmap])
-STARTCENTER_LEFT_BITMAP=
+AC_MSG_CHECKING([for yet another 'start center left' bitmap])
 if test -z $with_startcenter_left_bitmap -o $with_startcenter_left_bitmap 
= no ; then
-   STARTCENTER_LEFT_BITMAP=
+   if test $with_startcenter_left_bitmap = no ; then
+  STARTCENTER_LEFT_BITMAP=
+   fi
AC_MSG_RESULT([none])
 else
case $with_startcenter_left_bitmap in
@@ -9310,10 +9355,11 @@ else
 fi
 AC_SUBST(STARTCENTER_LEFT_BITMAP)
 
-AC_MSG_CHECKING([for another 'start center right' bitmap])
-STARTCENTER_RIGHT_BITMAP=
+AC_MSG_CHECKING([for yet another 'start center right' bitmap])
 if test -z $with_startcenter_right_bitmap -o 
$with_startcenter_right_bitmap = no ; then
-   STARTCENTER_RIGHT_BITMAP=
+   if test $with_startcenter_right_bitmap = no ; then
+  STARTCENTER_RIGHT_BITMAP=
+   fi
AC_MSG_RESULT([none])
 else
case $with_startcenter_right_bitmap in
@@ -9324,10 +9370,11 @@ else
 fi
 AC_SUBST(STARTCENTER_RIGHT_BITMAP)
 
-AC_MSG_CHECKING([for another 'start center rtl left' bitmap])
-STARTCENTER_RTL_LEFT_BITMAP=

[Libreoffice-commits] .: 10 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source

2011-11-28 Thread Kohei Yoshida

 offapi/UnoApi_offapi.mk   |1 
 offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl |   44 ++
 sc/inc/docuno.hxx |2 
 sc/inc/markdata.hxx   |8 +
 sc/inc/viewuno.hxx|   33 
 sc/source/core/data/markdata.cxx  |   19 ++
 sc/source/ui/inc/preview.hxx  |   67 +-
 sc/source/ui/inc/viewdata.hxx |4 
 sc/source/ui/unoobj/docuno.cxx|   51 ++-
 sc/source/ui/unoobj/viewuno.cxx   |  120 +++---
 sc/source/ui/view/preview.cxx |  117 +
 sc/source/ui/view/prevwsh.cxx |6 
 sc/source/ui/view/viewdata.cxx|4 
 13 files changed, 325 insertions(+), 151 deletions(-)

New commits:
commit 6a4bb3e17c79d1ce8b2528a4b9c22456be911f32
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Nov 28 23:44:47 2011 -0500

More meaningless comments removed.

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 19fc66a..272be84 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -937,7 +937,6 @@ void ScPreview::DataChanged( const DataChangedEvent rDCEvt 
)
 }
 }
 
-//Issue51656 Add resizeable margin on page preview from maoyg
 void ScPreview::MouseButtonDown( const MouseEvent rMEvt )
 {
 Fraction  aPreviewZoom( nZoom, 100 );
@@ -1471,7 +1470,7 @@ void ScPreview::MouseMove( const MouseEvent rMEvt )
 }
 }
 }
-//Issue51656 Add resizeable margin on page preview from maoyg
+
 void ScPreview::InvalidateLocationData(sal_uLong nId)
 {
 bLocationValid = false;
commit 4bbef9595f12dd5ac3c6f4558f4d466f84b8f5ad
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Nov 28 23:43:49 2011 -0500

Arg to CalcPages() no longer used.

diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 26ef7b3..f698291 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -104,7 +104,7 @@ private:
 longnFooterHeight;
 
 voidTestLastPage();
-voidCalcPages( SCTAB nToWhichTab );
+voidCalcPages();
 voidRecalcPages();
 voidUpdateDrawView();
 voidDoPrint( ScPreviewLocationData* pFillLocation );
@@ -154,15 +154,15 @@ public:
 sal_uInt16  GetZoom() const { return nZoom; }
 Point   GetOffset() const   { return aOffset; }
 
-SCTAB   GetTab(){ if (!bValid) { CalcPages(0); RecalcPages(); 
} return nTab; }
-longGetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); 
} return nTotalPages; }
+SCTAB   GetTab(){ if (!bValid) { CalcPages(); RecalcPages(); } 
return nTab; }
+longGetTotalPages() { if (!bValid) { CalcPages(); RecalcPages(); } 
return nTotalPages; }
 
 boolAllTested() const   { return bValid  nTabsTested = nTabCount; }
 
 sal_uInt16  GetOptimalZoom(bool bWidthOnly);
 longGetFirstPage(SCTAB nTab);
 
-voidCalcAll()   { CalcPages(MAXTAB); }
+voidCalcAll()   { CalcPages(); }
 voidSetInGetState(bool bSet) { bInGetState = bSet; }
 
 DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* );
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index fb72a8b..19fc66a 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -223,7 +223,7 @@ void ScPreview::TestLastPage()
 }
 
 
-void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
+void ScPreview::CalcPages()
 {
 WaitObject( this );
 
@@ -314,7 +314,7 @@ void ScPreview::RecalcPages()   // nur 
nPageNo geaendert
 bool bDone = false;
 while (nPageNo = nTotalPages  nTabsTested  nTabCount)
 {
-CalcPages( nTabsTested );
+CalcPages();
 bDone = true;
 }
 
@@ -351,7 +351,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* 
pFillLocation )
 {
 if (!bValid)
 {
-CalcPages(0);
+CalcPages();
 RecalcPages();
 UpdateDrawView();   // Tabelle evtl. geaendert
 }
@@ -674,7 +674,7 @@ String ScPreview::GetPosString()
 {
 if (!bValid)
 {
-CalcPages(nTab);
+CalcPages();
 UpdateDrawView();   // Tabelle evtl. geaendert
 }
 
@@ -742,7 +742,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP)
 long nPage = 0;
 if (nTabP0)
 {
-CalcPages( nTabP );
+CalcPages();
 UpdateDrawView();   // Tabelle evtl. geaendert
 
 for (SCTAB i=0; inTabP; i++)
commit 8ea81446029b314ae78e45fddb64903ea6ac5509
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Nov 28 23:41:09 2011 -0500

sal_Bool cleanup in ScPreview.

diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 9313d75..26ef7b3 100644
---

[Libreoffice-commits] .: sc/source

2011-11-28 Thread Kohei Yoshida

 sc/source/ui/view/tabvwsh4.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2d99262c2de5ccaaaee7b4cade3e05228a90eb64
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 29 00:51:51 2011 -0500

fdo#32826: Preserve selected sheets after print preview ended.

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e6f7946..5dc459d 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -94,6 +94,8 @@
 #include scabstdlg.hxx
 #include externalrefmgr.hxx
 #include docoptio.hxx
+#include markdata.hxx
+#include preview.hxx
 
 void ActivateOlk( ScViewData* pViewData );
 void DeActivateOlk( ScViewData* pViewData );
@@ -1725,6 +1727,9 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
 {
 ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh);
 nForceDesignMode = pPreviewShell-GetSourceDesignMode();
+ScPreview* p = pPreviewShell-GetPreview();
+if (p)
+GetViewData()-GetMarkData().SetSelectedTabs(p-GetSelectedTabs());
 }
 
 Construct( nForceDesignMode );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

37 matches

Mail list logo