[Libreoffice-commits] .: extensions/source

2011-10-27 Thread Tor Lillqvist 
 extensions/source/macosx/spotlight/GetMetadataForFile.m   |7 +++
 extensions/source/macosx/spotlight/OOoContentDataParser.m |7 +++
 extensions/source/macosx/spotlight/OOoMetaDataParser.m|7 +++
 extensions/source/macosx/spotlight/OOoSpotlightImporter.m |7 +++
 4 files changed, 28 insertions(+)

New commits:
commit 9d1dc25f564dada022e1b62fec834d183a1fd258
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Oct 26 17:44:12 2011 +0300

Copy-pasted workaround for building against MacOSX 10.6 SDK but with 10.4 
as the highest used API

Yeah, should really factor out this snippet into some header file. It
is already in premac.h, but I think premac.h can't be included as such
in all the places where this copy-pasted snippet now is. Need to
experiment.

diff --git a/extensions/source/macosx/spotlight/GetMetadataForFile.m 
b/extensions/source/macosx/spotlight/GetMetadataForFile.m
index 78a6af5..e47603d 100644
--- a/extensions/source/macosx/spotlight/GetMetadataForFile.m
+++ b/extensions/source/macosx/spotlight/GetMetadataForFile.m
@@ -26,6 +26,13 @@
  *
 */
 
+#import Foundation/NSObjCRuntime.h
+#if defined (NSFoundationVersionNumber10_5)   MAC_OS_X_VERSION_MAX_ALLOWED  
1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #include CoreFoundation/CoreFoundation.h
 #include CoreServices/CoreServices.h 
 #include Foundation/Foundation.h
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m 
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index a41a108..a35b219 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -26,6 +26,13 @@
  *
 */
 
+#import Foundation/NSObjCRuntime.h
+#if defined (NSFoundationVersionNumber10_5)   MAC_OS_X_VERSION_MAX_ALLOWED  
1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #import OOoContentDataParser.h
 
 @implementation OOoContentDataParser
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m 
b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index 3c8bb4c..cb26f91 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -26,6 +26,13 @@
  *
 */
 
+#import Foundation/NSObjCRuntime.h
+#if defined (NSFoundationVersionNumber10_5)   MAC_OS_X_VERSION_MAX_ALLOWED  
1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #import OOoMetaDataParser.h
 
 static NSSet *singleValueXMLElements;
diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m 
b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 884fb80..dcb6153 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -26,6 +26,13 @@
  *
 */
 
+#import Foundation/NSObjCRuntime.h
+#if defined (NSFoundationVersionNumber10_5)   MAC_OS_X_VERSION_MAX_ALLOWED  
1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #import OOoSpotlightImporter.h
 #import OOoMetaDataParser.h
 #import OOoContentDataParser.h
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/source

2011-10-27 Thread Fridrich Strba 
 writerperfect/source/filter/FontStyle.cxx   |1 
 writerperfect/source/filter/InternalHandler.cxx |2 -
 writerperfect/source/filter/OdtGenerator.cxx|6 +
 writerperfect/source/filter/TextRunStyle.cxx|   19 ++--
 writerperfect/source/filter/TextRunStyle.hxx|2 -
 writerperfect/source/filter/libwriterperfect_filter.cxx |3 +-
 writerperfect/source/filter/libwriterperfect_filter.hxx |4 ++-
 7 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit eac87fed20206377c5354eac6beccb90bb43ef20
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Oct 27 08:39:31 2011 +0200

Syncing with out-of-tree writerperfect

diff --git a/writerperfect/source/filter/FontStyle.cxx 
b/writerperfect/source/filter/FontStyle.cxx
index 9accf52..de1bd2e 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -88,5 +88,4 @@ WPXString FontStyleManager::findOrAdd(const char 
*psFontFamily)
 return psFontFamily;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/InternalHandler.cxx 
b/writerperfect/source/filter/InternalHandler.cxx
index 8a1389d..cb68b01 100644
--- a/writerperfect/source/filter/InternalHandler.cxx
+++ b/writerperfect/source/filter/InternalHandler.cxx
@@ -33,7 +33,7 @@ InternalHandler::InternalHandler(std::vectorDocumentElement 
* *elements):
 
 void InternalHandler::startElement(const char *psName, const WPXPropertyList 
xPropList)
 {
-TagOpenElement*element = new TagOpenElement(psName);
+TagOpenElement *element = new TagOpenElement(psName);
 WPXPropertyList::Iter i(xPropList);
 for (i.rewind(); i.next(); )
 {
diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 9533803..b597241 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -561,10 +561,16 @@ void OdtGenerator::openSection(const WPXPropertyList 
propList, const WPXPropert
 int iNumColumns = columns.count();
 double fSectionMarginLeft = 0.0;
 double fSectionMarginRight = 0.0;
+double fSectionSpaceAfter = 0.0;
 if (propList[fo:margin-left])
 fSectionMarginLeft = propList[fo:margin-left]-getDouble();
 if (propList[fo:margin-right])
 fSectionMarginRight = propList[fo:margin-right]-getDouble();
+if (propList[fo:margin-bottom])
+fSectionSpaceAfter = propList[fo:margin-bottom]-getDouble();
+else if (propList[libwpd:margin-bottom])
+fSectionSpaceAfter =  propList[libwpd:margin-bottom]-getDouble();
+
 
 if (iNumColumns  1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
 {
diff --git a/writerperfect/source/filter/TextRunStyle.cxx 
b/writerperfect/source/filter/TextRunStyle.cxx
index 35c6d27..e3ef8bb 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -200,21 +200,23 @@ void ParagraphStyleManager::write(OdfDocumentHandler 
*pHandler) const
 }
 }
 
-WPXString ParagraphStyleManager::getKey(const WPXPropertyList xPropList, 
const WPXPropertyListVector tabStops) const
+WPXString ParagraphStyleManager::getKey(WPXPropertyList const xPropList, 
WPXPropertyListVector const tabStops) const
 {
 WPXString sKey = propListToStyleKey(xPropList);
 
 WPXString sTabStops;
 sTabStops.sprintf([num-tab-stops:%i], tabStops.count());
 WPXPropertyListVector::Iter i(tabStops);
-for (i.rewind(); i.next(); )
+for (i.rewind(); i.next();)
+{
 sTabStops.append(propListToStyleKey(i()));
+}
 sKey.append(sTabStops);
 
 return sKey;
 }
 
-WPXString ParagraphStyleManager::findOrAdd (const WPXPropertyList propList, 
const WPXPropertyListVector tabStops)
+WPXString ParagraphStyleManager::findOrAdd(WPXPropertyList const propList, 
WPXPropertyListVector const tabStops)
 {
 WPXString hashKey = getKey(propList, tabStops);
 std::mapWPXString, ParagraphStyle *, ltstr::const_iterator iter = 
mHash.find(hashKey);
@@ -226,7 +228,8 @@ WPXString ParagraphStyleManager::findOrAdd (const 
WPXPropertyList propList, con
 
 WPXString sName;
 sName.sprintf(S%i, mHash.size());
-ParagraphStyle *pStyle = new ParagraphStyle(propList, tabStops, sName);
+ParagraphStyle *pStyle =
+new ParagraphStyle(propList, tabStops, sName);
 mHash[hashKey] = pStyle;
 return sName;
 }
@@ -235,7 +238,9 @@ void SpanStyleManager::clean()
 {
 for (std::mapWPXString, SpanStyle *, ltstr::iterator iter = 
mHash.begin();
 iter != mHash.end(); ++iter)
+{
 delete(iter-second);
+}
 mHash.clear();
 }
 
@@ -243,10 +248,12 @@ void SpanStyleManager::write(OdfDocumentHandler 
*pHandler) const
 {
 for (std::mapWPXString, SpanStyle *, ltstr::const_iterator iter = 
mHash.begin();
 iter != mHash.end(); ++iter)
-

[Libreoffice-commits] .: 3 commits - configmgr/source instsetoo_native/util scp2/source solenv/bin

2011-10-27 Thread Stephan Bergmann 
 configmgr/source/xcuparser.cxx   |3 +-
 instsetoo_native/util/openoffice.lst |3 --
 scp2/source/ooo/directory_ooo.scp|   27 ---
 scp2/source/ooo/ure_into_ooo.scp |2 -
 solenv/bin/modules/installer/windows/property.pm |6 -
 5 files changed, 3 insertions(+), 38 deletions(-)

New commits:
commit cbaadc7b05974ee13795ac182afd1b3121708d60
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 27 10:24:24 2011 +0200

Undo basis/brand split: removed obsoleted BASISROOTNAME.

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 35c927d..c9c0e20 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -8,7 +8,6 @@ Globals
OOOPACKAGEVERSION 3.5.0
UREPACKAGEVERSION 3.5.0
URELAYERVERSION 1
-   BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice3.5
SERVICETAG_PRODUCTNAME LibreOffice 3.5
SERVICETAG_PRODUCTVERSION 3.5
@@ -186,7 +185,6 @@ LibreOffice_Dev
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
SHORT_PRODUCTEXTENSION alpha0
-   BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
@@ -346,7 +344,6 @@ LibreOffice_Dev_SDK
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
-BASISROOTNAME LibO-dev
 UNIXBASISROOTNAME lo-dev
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 7a2bc51..110271b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -298,12 +298,6 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if ( $allvariables-{'BASISROOTNAME'} )
-{
-my $onepropertyline = BASISROOTNAME . \t . 
$allvariables-{'BASISROOTNAME'} . \n;
-push(@{$propertyfile}, $onepropertyline);
-}
-
 if ( $allvariables-{'EXCLUDE_FROM_REBASE'} )
 {
 my $onepropertyline =  EXCLUDE_FROM_REBASE . \t . 
$allvariables-{'EXCLUDE_FROM_REBASE'} . \n;
commit 977506ef8f19e9c2c719547537872df64f8c56d3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 27 10:23:52 2011 +0200

Undo basis/brand split: removed obsoleted basis directories.

diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 9ee91e9..8c52897 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,33 +69,6 @@ Directory 
gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Openofficeorg
-ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-HostName = ${BASISROOTNAME};
-  #else
-HostName = .;
-  #endif
-End
-#endif
-
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Basis
-  #ifdef WNT
-ParentID = gid_Dir_Brand_Root;
-  #else
-ParentID = gid_Dir_Ooo_Openofficeorg;
-  #endif
-  #ifdef WNT
-HostName = Basis;
-  #else
-HostName = basis${OOOBASEVERSION};
-  #endif
-Styles = (BASISDIRECTORY, CREATE);
-End
-#endif
-
 #if defined MACOSX
 Unixlink gid_Unixlink_Applications
 BIN_FILE_BODY;
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index a67a508..c2dd9bc 100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -32,7 +32,7 @@ Directory gid_Dir_Common_Ure
   #ifdef WNT
 ParentID = gid_Dir_Brand_Root;
   #else
-ParentID = gid_Dir_Ooo_Openofficeorg;
+ParentID = PREDEFINED_PROGDIR;
   #endif
   #ifdef WNT
 HostName = URE;
commit 9d9f9939bd1bd0f599f4461c30b6433aa92cb101
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 27 08:33:55 2011 +0200

Fixed previous configmgr layer numbering fix.

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 4746bcf..7d5a2a7 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -1109,7 +1109,8 @@ void XcuParser::handleSetNode(xmlreader::XmlReader  
reader, SetNode * set) {
 bool known = i != set-getMembers().end();
 if (known  !state_.top().locked 
 finalizedLayer = valueParser_.getLayer() 
-(!mandatory || mandatoryLayer  valueParser_.getLayer()))
+(mandatoryLayer == Data::NO_LAYER ||
+ mandatoryLayer  valueParser_.getLayer()))
 {
 set-getMembers().erase(i);
 }
___
Libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2011-10-27 Thread Michael Meeks 
 vcl/unx/gtk/window/gtkframe.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 71c5eb4c41fe4f36f975950cbb616796d9d7bfe5
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 27 10:38:12 2011 +0100

gtk3: disable signalDraw for gtk2 case to avoid cairo build issues

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 87d1f49..8cf6cd7 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3118,7 +3118,6 @@ void GtkSalFrame::renderArea( cairo_t *cr, 
cairo_rectangle_t *area )
 cairo_restore( cr );
 }
 }
-#endif
 
 gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
 {
@@ -3132,11 +3131,9 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t 
*cr, gpointer frame )
 if (debugQueuePureRedraw  0)
 {
 debugQueuePureRedraw--;
-#if GTK_CHECK_VERSION(3,0,0)
 fprintf (stderr, skip signalDraw for debug %d\n, 
debugQueuePureRedraw);
 cairo_rectangle_t rect = { x1, y1, x2 - x1, y2 - y1 };
 pThis-renderArea( cr, rect );
- #endif
 return FALSE;
 }
 
@@ -3157,15 +3154,15 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t 
*cr, gpointer frame )
 struct SalPaintEvent aEvent( rect.x, rect.y, rect.width, rect.height );
 aEvent.mbImmediateUpdate = true;
 pThis-CallCallback( SALEVENT_PAINT, aEvent );
-#if GTK_CHECK_VERSION(3,0,0)
 pThis-renderArea( cr, rect );
-#endif
 }
 
 pThis-m_nDuringRender--;
 
 return FALSE;
 }
+#endif // GTK_CHECK_VERSION(3,0,0)
+
 
 gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, 
gpointer frame )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-27 Thread Michael Meeks 
 vcl/headless/svpgdi.cxx |   82 +---
 vcl/headless/svptext.cxx|7 ++-
 vcl/inc/headless/svpgdi.hxx |4 +-
 3 files changed, 55 insertions(+), 38 deletions(-)

New commits:
commit d9d82ffc6b16051f002e297109509488972a9c92
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 27 11:41:34 2011 +0100

headless: cleanup degenerate clipping case to not render or warn.

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 439cb1e..2a086b3 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -196,13 +196,16 @@ SvpSalGraphics::ClipUndoHandle::~ClipUndoHandle()
 
 // setup a clip rectangle -only- iff we have to; if aRange
 // is entirely contained inside an existing clip frame, we
-// will avoid setting up the clip bitmap.
-SvpSalGraphics::ClipUndoHandle SvpSalGraphics::ensureClipFor( const 
basegfx::B2IRange aRange )
+// will avoid setting up the clip bitmap. Similarly if the
+// range doesn't appear at all we return true to avoid
+// rendering
+bool SvpSalGraphics::isClippedSetup( const basegfx::B2IRange aRange, 
SvpSalGraphics::ClipUndoHandle rUndo )
 {
-ClipUndoHandle aRet(this);
+if( m_bClipSetup )
+return false;
 
-if (m_bClipSetup)
-return aRet;
+if( m_aClipRegion.IsEmpty() ) // no clipping
+return false;
 
 // fprintf( stderr, ensureClipFor: %d, %d %dx%d\n,
 // aRange.getMinX(), aRange.getMinY(),
@@ -226,34 +229,32 @@ SvpSalGraphics::ClipUndoHandle 
SvpSalGraphics::ensureClipFor( const basegfx::B2I
 }
 m_aClipRegion.EndEnumRects (aHnd);
 
-if( nHit == 0 )
+if( nHit == 0 ) // rendering outside any clipping region
 {
-// degenerate case - we're all clipped ... hmm.
-#if defined( UNX )
-fprintf (stderr, FIXME: denegerate case detected ...\n);
-#endif
+//fprintf (stderr, denegerate case detected ...\n);
+return true;
 }
-else if( nHit == 1 )
+else if( nHit == 1 ) // common path: rendering against just one clipping 
region
 {
-if( aIterRect.IsInside( aRect ) )
+if( aHitRect.IsInside( aRect ) )
 {
-//fprintf (stderr,  is inside ! avoid deeper clip ...\n);
-return aRet;
+//fprintf (stderr,  is inside ! avoid deeper clip ...\n);
+return false;
 }
-//fprintf (stderr,  operation only overlaps with a single clip 
zone\n );
-aRet.m_aDevice = m_aDevice;
+//fprintf (stderr,  operation only overlaps with a single clip zone\n );
+rUndo.m_aDevice = m_aDevice;
 m_aDevice = basebmp::subsetBitmapDevice( m_aOrigDevice,
  basegfx::B2IRange 
(aHitRect.Left(),
 
aHitRect.Top(),
 
aHitRect.Right(),
 
aHitRect.Bottom()) );
-return aRet;
+return false;
 }
-// else
-//fprintf (stderr, URK: complex  slow clipping case\n );
+//fprintf (stderr, URK: complex  slow clipping case\n );
+// horribly slow  complicated case ...
 
 ensureClip();
-return aRet;
+return false;
 }
 
 
@@ -534,8 +535,9 @@ void SvpSalGraphics::copyArea( long nDestX,
 B2IRange aDestRect( nDestX, nDestY, nDestX+nSrcWidth, nDestY+nSrcHeight );
 // fprintf( stderr, copyArea %ld pixels - clip region %d\n,
 // (long)(nSrcWidth * nSrcHeight), m_aClipMap.get() != NULL );
-SvpSalGraphics::ClipUndoHandle aUndo = ensureClipFor( aDestRect );
-m_aDevice-drawBitmap( m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT, 
m_aClipMap );
+SvpSalGraphics::ClipUndoHandle aUndo( this );
+if( !isClippedSetup( aDestRect, aUndo ) )
+m_aDevice-drawBitmap( m_aOrigDevice, aSrcRect, aDestRect, 
DrawMode_PAINT, m_aClipMap );
 dbgOut( m_aDevice );
 }
 
@@ -550,8 +552,10 @@ void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
 B2IRange aDestRect( pPosAry-mnDestX, pPosAry-mnDestY,
 pPosAry-mnDestX+pPosAry-mnDestWidth,
 pPosAry-mnDestY+pPosAry-mnDestHeight );
-SvpSalGraphics::ClipUndoHandle aUndo = ensureClipFor( aDestRect );
-m_aDevice-drawBitmap( pSrc-m_aOrigDevice, aSrcRect, aDestRect, 
DrawMode_PAINT, m_aClipMap );
+
+SvpSalGraphics::ClipUndoHandle aUndo( this );
+if( !isClippedSetup( aDestRect, aUndo ) )
+m_aDevice-drawBitmap( pSrc-m_aOrigDevice, aSrcRect, aDestRect, 
DrawMode_PAINT, m_aClipMap );
 dbgOut( m_aDevice );
 }
 
@@ -565,8 +569,10 @@ void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
 B2IRange aDestRect( pPosAry-mnDestX, pPosAry-mnDestY,
 pPosAry-mnDestX+pPosAry-mnDestWidth,
 pPosAry-mnDestY+pPosAry-mnDestHeight );
-SvpSalGraphics::ClipUndoHandle aUndo =

[Libreoffice-commits] .: 3 commits - svtools/source unusedcode.easy vcl/generic vcl/inc vcl/source

2011-10-27 Thread Caolán McNamara 
 svtools/source/misc/sampletext.cxx |5 +-
 unusedcode.easy|   24 +
 vcl/generic/fontmanager/fontconfig.cxx |   18 -
 vcl/generic/fontmanager/fontsubst.cxx  |6 ++-
 vcl/generic/glyphs/glyphcache.cxx  |7 +++
 vcl/inc/outfont.hxx|   19 ++
 vcl/inc/vcl/fontmanager.hxx|3 +
 vcl/source/gdi/outdev3.cxx |   60 ++---
 8 files changed, 116 insertions(+), 26 deletions(-)

New commits:
commit c17aeee2d97fdc5ff941aae66dd01d6a58386f89
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 27 12:48:42 2011 +0100

probably better Japanese longer text preview

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 33a49c6..7c2be7b 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -449,10 +449,9 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode 
eScript)
 }
 case USCRIPT_JAPANESE:
 {
-//Iroha
+//'Beautiful Japanese'
 const sal_Unicode aJa[] = {
-0x8272, 0x306F, 0x5302, 0x3078, 0x3069, 0x0020, 0x6563,
-0x308A, 0x306C, 0x308B, 0x3092
+0x7F8E, 0x3057, 0x3044, 0x65E5, 0x672C, 0x8A9E
 };
 sSampleText = rtl::OUString(aJa, SAL_N_ELEMENTS(aJa));
 break;
commit 5eac2ffaa08d4a9bb251491bfdbca15281c3a21b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 27 12:48:26 2011 +0100

update unused list

diff --git a/unusedcode.easy b/unusedcode.easy
index db7aeea..b153d42 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -199,6 +199,9 @@ Graphic::StartAnimation(OutputDevice*, Point const, long, 
OutputDevice*)
 Graphic::WriteEmbedded(SvStream)
 GraphicReader::IsPreviewModeEnabled() const
 GroupTable::SkipCurrentGroup()
+GtkSalFrame::popIgnoreDamage()
+GtkSalFrame::pushIgnoreDamage()
+GtkSalFrame::signalDraw(_GtkWidget*, _cairo*, void*)
 HTMLControls::Insert(HTMLControl const*, unsigned short)
 HTMLControls::Insert(HTMLControl const**, unsigned short)
 HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
@@ -367,6 +370,7 @@ SVGExport::pushClip(basegfx::B2DPolyPolygon const)
 SalColormap::SalColormap(BitmapPalette const)
 SalColormap::SetPalette(BitmapPalette const)
 SalDisplay::IsLocal()
+SalGraphics::AddDevFontSubstitute(OutputDevice*, String const, String const, 
unsigned short)
 SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const, unsigned int, 
OutputDevice const*)
 SalGraphics::drawAlphaBitmap(SalTwoRect const, SalBitmap const, SalBitmap 
const)
 SalGraphics::drawPolyLine(basegfx::B2DPolygon const, double, 
basegfx::B2DVector const, basegfx::B2DLineJoin)
@@ -1454,6 +1458,8 @@ _ZSortFlys::Remove(_ZSortFly const, unsigned short)
 _ZSortFlys_SAR::Replace(_ZSortFly const, unsigned short)
 _ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
 _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char 
(*)(_ZSortFly const, void*), void*)
+basebmp::BitmapDevice::getPaletteEntryCount() const
+basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const)
 basebmp::debugDump(boost::shared_ptrbasebmp::BitmapDevice const, 
std::basic_ostreamchar, std::char_traitschar )
 basegfx::B1DRange::B1DRange(basegfx::B1IRange const)
 basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const, 
basegfx::B2DPoint const)
@@ -2380,11 +2386,15 @@ 
layoutimpl::getParent(com::sun::star::uno::Referencecom::sun::star::uno::XInter
 
layoutimpl::prophlp::getProperty(com::sun::star::uno::Referencecom::sun::star::uno::XInterface
 const, rtl::OUString const)
 libcmis::SessionFactory::getRepositories(std::__debug::mapint, 
std::basic_stringchar, std::char_traitschar, std::allocatorchar , 
std::lessint, std::allocatorstd::pairint const, std::basic_stringchar, 
std::char_traitschar, std::allocatorchar)
 libvisio::VSDXCharacterList::getElement(unsigned int)
+libvisio::VSDXContentCollector::charStyleFromStyleSheet(unsigned int)
+libvisio::VSDXContentCollector::paraStyleFromStyleSheet(unsigned int)
+libvisio::VSDXContentCollector::textBlockStyleFromStyleSheet(unsigned int)
 libvisio::VSDXOutputElementList::addEllipse(WPXPropertyList const)
 libvisio::VSDXOutputElementList::addEndLayer()
 libvisio::VSDXOutputElementList::addStartLayer(WPXPropertyList const)
 libvisio::VSDXOutputElementList::clear()
 libvisio::VSDXPage::VSDXPage(double, double, unsigned int, unsigned int, 
libvisio::VSDXOutputElementList const)
+libvisio::VSDXParagraphList::getElement(unsigned int)
 libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString)
 libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, 
WPXString, libwpg::WPGFileFormat)
 libwpg::WPGraphics::parse(unsigned char const*, unsigned long, 
libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
@@ -2604,14 +2614,28 @@ sd::ViewShellBase::RegisterFactory(unsigned

[Libreoffice-commits] .: writerperfect/source

2011-10-27 Thread Caolán McNamara 
 writerperfect/source/filter/OdtGenerator.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit c6e86f8b7af28d990b9539903560554fc130775e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 27 13:54:19 2011 +0100

fSectionSpaceAfter is unused

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index b597241..9533803 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -561,16 +561,10 @@ void OdtGenerator::openSection(const WPXPropertyList 
propList, const WPXPropert
 int iNumColumns = columns.count();
 double fSectionMarginLeft = 0.0;
 double fSectionMarginRight = 0.0;
-double fSectionSpaceAfter = 0.0;
 if (propList[fo:margin-left])
 fSectionMarginLeft = propList[fo:margin-left]-getDouble();
 if (propList[fo:margin-right])
 fSectionMarginRight = propList[fo:margin-right]-getDouble();
-if (propList[fo:margin-bottom])
-fSectionSpaceAfter = propList[fo:margin-bottom]-getDouble();
-else if (propList[libwpd:margin-bottom])
-fSectionSpaceAfter =  propList[libwpd:margin-bottom]-getDouble();
-
 
 if (iNumColumns  1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bin/lo-pack-sources

2011-10-27 Thread Miklos Vajna 
 bin/lo-pack-sources |   60 
 1 file changed, 60 deletions(-)

New commits:
commit a32662e141e861f2a4960e7e1c21ee3b70b0e57d
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Oct 27 15:58:27 2011 +0200

lo-pack-sources: remove unused functions

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index cb4372f..1a24baf 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -107,24 +107,6 @@ sub get_release_version()
 }
 
 
-sub generate_lo_build_blacklist($)
-{
-my ($blacklist) = @_;
-
-# FIXME: crazy hacks to copy libreoffice-build without too big and useless 
subdirectories and to show a progress
-open (BLACKLIST, $blacklist) || die Can't open $blacklist: $!\n;
-
-# IMPORTANT: Do not remove .git directories because git log is called 
during make dist
-print BLACKLIST */.svn\n;
-print BLACKLIST rawbuild/*\n;
-print BLACKLIST build/*\n;
-print BLACKLIST clone/*\n;
-print BLACKLIST src/libreoffice-*.tar.bz2\n;
-print BLACKLIST src/-*\n;
-
-close BLACKLIST;
-}
-
 sub generate_lo_piece_blacklist($)
 {
 my ($blacklist) = @_;
@@ -177,23 +159,6 @@ sub copy_dir_filter_and_show_progress($$$)
 print \n;
 }
 
-# copy the local version of libreoffice-build into a tmp directory
-# omit the .svn subdirectories
-sub copy_lo_build_to_tempdir($)
-{
-my ($lo_build_dir) = @_;
-
-my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
-my $blacklist = $tempdir/libreoffice-build.copy.blacklist;
-
-generate_lo_build_blacklist($blacklist);
-copy_dir_filter_and_show_progress($lo_build_dir, $tempdir, $blacklist);
-
-unlink $blacklist;
-
-return $tempdir;
-}
-
 # copy the piece lo source directory into a tmp directory
 # omit the .git subdirectories
 sub copy_lo_piece_to_tempdir($$$)
@@ -250,17 +215,6 @@ sub generate_version_file($$$)
 close VERFILE;
 }
 
-sub release_lo_build($)
-{
-my ($lo_build_dir) = @_;
-
-print Creating libreoffice-build tarball...\n;
-system (cd $lo_build_dir   .
-./autogen.sh --with-distro=GoOoLinux   .
-make dist   .
-cd - /dev/null 21)  die Error: releasing failed: $!\n;
-}
-
 sub release_lo_piece($$)
 {
 my ($lo_piece_dir, $piece_tarball_name) = @_;
@@ -415,18 +369,6 @@ sub check_if_already_released($$)
 }
 }
 
-sub prepare_lo_build_tarball()
-{
-my ($lo_build_dir, $release_version, $md5, $lo_build_tarball_name) = @_;
-
-my $temp_dir = copy_lo_build_to_tempdir($lo_build_dir);
-set_config_version($temp_dir, $release_version);
-release_lo_build($temp_dir);
-generate_md5($temp_dir, $lo_build_tarball_name, .tar.gz) if (defined 
$md5);
-
-return $temp_dir;
-}
-
 sub prepare_lo_piece_tarball($)
 {
 my ($piece_dir, $release_version, $md5, $piece, $piece_tarball_name) = @_;
@@ -461,8 +403,6 @@ sub generate_tarballs($)
 my ($source_dir, $releases_archive_dir, $release_version, $md5, 
$lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, 
$is_lo_build_dir) = @_;
 
 if ($pack_lo_build) {
-#my $temp_dir=prepare_lo_build_tarball($source_dir, $release_version, 
$md5, $lo_build_tarball_name);
-#move_tarball_to_final_location($temp_dir, $releases_archive_dir, 
$md5, $lo_build_tarball_name.tar.gz);
 my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, 
$md5, bootstrap, $lo_build_tarball_name);
 move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, 
$lo_build_tarball_name.tar.bz2);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2011-10-27 Thread Caolán McNamara 
 vcl/unx/generic/app/saldisp.cxx |   38 --
 1 file changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 8619d58ecdaf181bd1a2a65c371545d7d9f80c14
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 27 15:20:14 2011 +0100

there is no USE_XINERAMA define, but USE_XINERAMA_XSUN/USE_XINERAMA_XORG

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 74c4ef7..a26027d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -58,7 +58,6 @@
 #include X11/XKBlib.h
 #include X11/Xatom.h
 
-#ifdef USE_XINERAMA
 #ifdef USE_XINERAMA_XORG
 #include X11/extensions/Xinerama.h
 #elif defined USE_XINERAMA_XSUN
@@ -69,9 +68,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned 
char*, int*);
 #else
 #include X11/extensions/xinerama.h
 #endif
-#else
-#error USE_XINERAMA but no xinerama version
-#endif
 #endif
 
 #include tools/postx.h
@@ -2455,7 +2451,6 @@ void SalDisplay::InitXinerama()
 m_bXinerama = false;
 return; // multiple screens mean no xinerama
 }
-#ifdef USE_XINERAMA
 #if defined(USE_XINERAMA_XSUN)
 int nFramebuffers = 1;
 if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
@@ -2480,28 +2475,28 @@ void SalDisplay::InitXinerama()
 }
 }
 #elif defined(USE_XINERAMA_XORG)
-if( XineramaIsActive( pDisp_ ) )
-{
-int nFramebuffers = 1;
-XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_, 
nFramebuffers );
-if( pScreens )
+if( XineramaIsActive( pDisp_ ) )
 {
-if( nFramebuffers  1 )
+int nFramebuffers = 1;
+XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_, 
nFramebuffers );
+if( pScreens )
 {
-m_aXineramaScreens = std::vectorRectangle();
-m_aXineramaScreenIndexMap = std::vectorint(nFramebuffers);
-for( int i = 0; i  nFramebuffers; i++ )
+if( nFramebuffers  1 )
 {
-addXineramaScreenUnique( i, pScreens[i].x_org,
- pScreens[i].y_org,
- pScreens[i].width,
- pScreens[i].height );
+m_aXineramaScreens = std::vectorRectangle();
+m_aXineramaScreenIndexMap = std::vectorint(nFramebuffers);
+for( int i = 0; i  nFramebuffers; i++ )
+{
+addXineramaScreenUnique( i, pScreens[i].x_org,
+ pScreens[i].y_org,
+ pScreens[i].width,
+ pScreens[i].height );
+}
+m_bXinerama = m_aXineramaScreens.size()  1;
 }
-m_bXinerama = m_aXineramaScreens.size()  1;
+XFree( pScreens );
 }
-XFree( pScreens );
 }
-}
 #endif
 #if OSL_DEBUG_LEVEL  1
 if( m_bXinerama )
@@ -2510,7 +2505,6 @@ if( XineramaIsActive( pDisp_ ) )
 fprintf( stderr, Xinerama screen: %ldx%ld+%ld+%ld\n, 
it-GetWidth(), it-GetHeight(), it-Left(), it-Top() );
 }
 #endif
-#endif // USE_XINERAMA
 }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-10-27 Thread Fridrich Strba 
 scp2/source/ooo/file_font_ooo.scp |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 06e64daff148d5a94913bfe88b0c454fb2bfb0d6
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Thu Oct 27 11:27:27 2011 -0200

Remove restriction for Liberation fonts in Windows build

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index 55e1f0f..fef7b3b 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -91,33 +91,27 @@ STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, 
LiberationSansNarrow-BoldI
 
 // Liberation Mono
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, 
LiberationMono-Regular.ttf, Liberation Mono Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, 
Liberation Mono Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, 
Liberation Mono Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, 
LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) 
 #endif
-#endif
 
 // Liberation Sans
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, 
LiberationSans-Regular.ttf, Liberation Sans Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, 
Liberation Sans Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, 
Liberation Serif Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, 
LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
 #endif
-#endif
 
 // Liberation Serif
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, 
LiberationSerif-Regular.ttf, Liberation Serif Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, 
Liberation Serif Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, 
LiberationSerif-Italic.ttf, Liberation Serif Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, 
LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
 #endif
-#endif
 
 // Gentium fonts
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-10-27 Thread David Tardon 
 basic/source/uno/namecont.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8ff172492431d77f4a09a36bec51b8c6361c1854
Author: David Tardon dtar...@redhat.com
Date:   Thu Oct 27 15:54:28 2011 +0200

these are files--no trailing /

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c0733a3..988c5c9 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -762,7 +762,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
 pLibInfoInetObj = new INetURLObject( 
String(maLibraryPath).GetToken(0) );
 else
 pLibInfoInetObj = new INetURLObject( 
String(maLibraryPath).GetToken(1) );
-pLibInfoInetObj-insertName( maInfoFileName, sal_True, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+pLibInfoInetObj-insertName( maInfoFileName, sal_False, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
 pLibInfoInetObj-setExtension( OUString( 
RTL_CONSTASCII_USTRINGPARAM(xlc) ) );
 aFileName = pLibInfoInetObj-GetMainURL( 
INetURLObject::NO_DECODE );
 }
@@ -786,7 +786,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
 if( !xInput.is()  nPass == 0 )
 {
 INetURLObject aLibInfoInetObj( 
String(maLibraryPath).GetToken(1) );
-aLibInfoInetObj.insertName( maOldInfoFileName, sal_True, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+aLibInfoInetObj.insertName( maOldInfoFileName, sal_False, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
 aLibInfoInetObj.setExtension( OUString( 
RTL_CONSTASCII_USTRINGPARAM(xli) ) );
 aFileName = aLibInfoInetObj.GetMainURL( 
INetURLObject::NO_DECODE );
 
@@ -1105,7 +1105,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
 }
 
 INetURLObject aPrevUserBasicLibInfoInetObj( aUserBasicInetObj 
);
-aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, 
sal_True, INetURLObject::LAST_SEGMENT,
+aPrevUserBasicLibInfoInetObj.insertName( maInfoFileName, 
sal_False, INetURLObject::LAST_SEGMENT,
 sal_True, 
INetURLObject::ENCODE_ALL );
 aPrevUserBasicLibInfoInetObj.setExtension( OUString( 
RTL_CONSTASCII_USTRINGPARAM(xlc) ) );
 OUString aLibInfoFileName = 
aPrevUserBasicLibInfoInetObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -1302,7 +1302,7 @@ void SfxLibraryContainer::checkStorageURL( const 
OUString aSourceURL,
 {
 // URL to library folder
 aStorageURL = aExpandedSourceURL;
-aInetObj.insertName( maInfoFileName, sal_True, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+aInetObj.insertName( maInfoFileName, sal_False, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
 aInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM(xlb) ) 
);
 aLibInfoFileURL = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
 }
@@ -1609,7 +1609,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( 
SfxLibrary* pLib,
 if( !xSFI-isFolder( aLibDirPath ) )
 xSFI-createFolder( aLibDirPath );
 
-aInetObj.insertName( maInfoFileName, sal_True, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+aInetObj.insertName( maInfoFileName, sal_False, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
 aInetObj.setExtension( OUString( 
RTL_CONSTASCII_USTRINGPARAM(xlb) ) );
 aLibInfoPath = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
 }
@@ -2067,7 +2067,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference embed::XSto
 {
 // Create Output stream
 INetURLObject aLibInfoInetObj( String(maLibraryPath).GetToken(1) );
-aLibInfoInetObj.insertName( maInfoFileName, sal_True, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
+aLibInfoInetObj.insertName( maInfoFileName, sal_False, 
INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL );
 aLibInfoInetObj.setExtension( OUString( 
RTL_CONSTASCII_USTRINGPARAM(xlc) ) );
 String aLibInfoPath( aLibInfoInetObj.GetMainURL( 
INetURLObject::NO_DECODE ) );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bin/lo-pack-sources vcl/inc

2011-10-27 Thread Petr Mladek 
 bin/lo-pack-sources  |   27 ++-
 vcl/inc/unx/gtk/gtkframe.hxx |3 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 4b32624c1890dd8ff146b00b0c1699d75f4a0513
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Oct 27 17:08:35 2011 +0200

lo-pack-sources: update for the current list of repositories

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 1a24baf..6a68e71 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -210,7 +210,7 @@ sub generate_version_file($$$)
 # FIXME: crazy hacks to copy libreoffice-build without too big and useless 
subdirectories and to show a progress
 open (VERFILE, $dir/$piece.ver) || die Can't open $dir/lo-$piece.ver: 
$!\n;
 
-print VERFILE lo_bootstrap_ver=$release_version\n;
+print VERFILE lo_core_ver=$release_version\n;
 
 close VERFILE;
 }
@@ -375,8 +375,8 @@ sub prepare_lo_piece_tarball($)
 
 my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece, 
$piece_tarball_name);
 generate_lo_piece_changelog($piece_dir, $temp_dir/$piece_tarball_name, 
$piece);
-run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq 
'bootstrap');
-generate_version_file($temp_dir/$piece_tarball_name, $piece, 
$release_version) if ($piece eq 'bootstrap');
+run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq 
'core');
+generate_version_file($temp_dir/$piece_tarball_name, $piece, 
$release_version) if ($piece eq 'core');
 release_lo_piece($temp_dir, $piece_tarball_name);
 generate_md5($temp_dir, $piece_tarball_name, .tar.bz2) if (defined $md5);
 
@@ -403,7 +403,7 @@ sub generate_tarballs($)
 my ($source_dir, $releases_archive_dir, $release_version, $md5, 
$lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, 
$is_lo_build_dir) = @_;
 
 if ($pack_lo_build) {
-my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, 
$md5, bootstrap, $lo_build_tarball_name);
+my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, 
$md5, core, $lo_build_tarball_name);
 move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, 
$lo_build_tarball_name.tar.bz2);
 }
 
@@ -466,10 +466,7 @@ my $lo_build_tempdir;
 my $force;
 my $verbose=1;
 my $is_lo_build_dir=0;
-my @pieces=(artwork, base, calc, components,
-extensions, extras, filters, help, impress,
-libs-core, libs-extern, libs-extern-sys, libs-gui,
-postprocess, sdk, testing, translations, ure, writer);
+my @pieces=(binfilter, dictionaries, help, translations);
 my %piece_tarball_name;
 
 ###
@@ -523,12 +520,12 @@ unless ( -d $source_dir ) {
 die Error: is not a directory: $source_dir\n;
 }
 
-# check if it is a valid libreoffice-bootstrap directory
+# check if it is a valid libreoffice-core directory
 $is_lo_build_dir=1 if (-f $source_dir/autogen.sh  -f 
$source_dir/set_soenv.in);
 
-# all tarballs are generated from the libreoffice-bootstrap directory
+# all tarballs are generated from the libreoffice-core directory
 if (@pieces  1  $is_lo_build_dir == 0 ) {
-die Error: \$source_dir\ is not a valid libreoffice-bootstrap 
directory\n;
+die Error: \$source_dir\ is not a valid libreoffice-core directory\n;
 }
 
 # just a single piece tarball can be generated from piece directory; version 
must be explicitely set in this case
@@ -567,9 +564,13 @@ if ($is_lo_build_dir) {
 }
 
 # define tarball names
-$lo_build_tarball_name = libreoffice-bootstrap-$release_version;
+$lo_build_tarball_name = libreoffice-core-$release_version;
 foreach my $piece (@pieces) {
-$piece_tarball_name{$piece} = libreoffice-$piece-$release_version;
+if (-d $source_dir/clone/$piece) {
+$piece_tarball_name{$piece} = libreoffice-$piece-$release_version;
+} else {
+print Warning: $piece sources are not available - skipping\n;
+}
 }
 
 print Default version   : $config_version\n if ($verbose  defined 
$config_version);
commit a608d0664371c21c854e1f91aee2210a17641220
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Oct 26 17:16:40 2011 +0200

renderArea is implemented only with GTK-3

fixes build on SLED10 with gtk-2.8 and cairo-1.0.2

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index edd904e..e4cf0be 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -325,8 +325,9 @@ public:
 // only for gtk3 ...
 void pushIgnoreDamage();
 void popIgnoreDamage();
+#if GTK_CHECK_VERSION(3,0,0)
 void renderArea( cairo_t *cr, cairo_rectangle_t *src );
-
+#endif
 virtual ~GtkSalFrame();
 
 // SalGraphics or NULL, but two Graphics for all SalFrames
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2011-10-27 Thread Noel Power 
 sc/qa/unit/macros-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d3c18a6436e5e27f9d229a3b80a25d61d599461f
Author: Noel Power noel.po...@novell.com
Date:   Thu Oct 27 16:46:45 2011 +0100

attempt to disable macro_test tests for macosx

diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index a971d20..a58c92d 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -125,15 +125,15 @@ public:
 
 void testStarBasic();
 void testVba();
-
 CPPUNIT_TEST_SUITE(ScMacrosTest);
+#ifndef MACOSX
 //enable this test if you want to play with star basic macros in unit tests
 //works but does nothing useful yet
 CPPUNIT_TEST(testStarBasic);
 //enable if you want to hack vba support for unit tests
 //does not work, still problems during loading
 CPPUNIT_TEST(testVba);
-
+#endif
 
 CPPUNIT_TEST_SUITE_END();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_svx

2011-10-27 Thread Norbert Thiebaud 
 binfilter/bf_svx/util/bf_sfxwin.flt |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 522e9fe9e46e52f4c7ac48858ee6cd82a2e0eb48
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Oct 27 10:15:55 2011 -0500

remove unused SfxObjectVerbsControl class

diff --git a/binfilter/bf_svx/util/bf_sfxwin.flt 
b/binfilter/bf_svx/util/bf_sfxwin.flt
index 690014f..3517175 100644
--- a/binfilter/bf_svx/util/bf_sfxwin.flt
+++ b/binfilter/bf_svx/util/bf_sfxwin.flt
@@ -147,7 +147,6 @@ SfxNewHdl
 SfxObjectBarConfigPage
 SfxObjectBarListBox
 SfxObjectList
-SfxObjectVerbsControl
 SfxOfflineURLManager
 SfxPlugInFrame
 SfxPlugInObjectShell
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - toolkit/source toolkit/workben

2011-10-27 Thread Julien Nabet 
 toolkit/source/layout/core/import.cxx |2 +-
 toolkit/workben/layout/editor.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ffe9d3613ca2cbe54703a77d30dc62e25734a28f
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Oct 27 22:46:39 2011 +0200

Trace one catch, add a return false in another one

diff --git a/toolkit/workben/layout/editor.cxx 
b/toolkit/workben/layout/editor.cxx
index ceee0fd..f46afb6 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -296,7 +296,9 @@ public:
 try {
 mxContainer-addChild( pChild-mxWidget );
 }
-catch( awt::MaxChildrenException ex ) {
+catch( awt::MaxChildrenException rEx) {
+fprintf (stderr, ERROR: MaxChildrenException: '%s'.\n,
+ rtl::OUStringToOString (rEx.Message, 
RTL_TEXTENCODING_UTF8).getStr());
 return false;
 }
 
@@ -331,6 +333,7 @@ public:
 } catch ( beans::UnknownPropertyException rEx ) {
 fprintf (stderr, ERROR: widget reports that it has a property it 
cannot return: '%s' this normally means that someone screwed up their 
PROPERTY_SET_INFO macro usage.\n,
  rtl::OUStringToOString (rEx.Message, 
RTL_TEXTENCODING_UTF8).getStr());
+return false;
 }
 }
 }
commit 95ed6bc10cadf3706548cb297cceb9eaab6ff05a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Oct 27 21:57:05 2011 +0200

C-Style casting replaced by C++ style

diff --git a/toolkit/source/layout/core/import.cxx 
b/toolkit/source/layout/core/import.cxx
index 5114ca5..fdc90de 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -77,7 +77,7 @@ SAL_THROW (())
 //DEBUG
 uno::Reference awt::XLayoutConstrains  xParent;
 if ( pParent )
-xParent = ((WidgetElement *) pParent)-mpWidget-getPeer();
+xParent = (static_castWidgetElement 
*(pParent))-mpWidget-getPeer();
 
 
 mpWidget = pImport-mrRoot.create( aId, name,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sfx2/source sw/source unusedcode.easy

2011-10-27 Thread Caolán McNamara 
 sfx2/source/appl/appreg.cxx|1 +
 sw/source/filter/html/htmldraw.cxx |7 +++
 sw/source/filter/html/htmlfly.cxx  |   36 +---
 sw/source/filter/html/htmlforw.cxx |8 
 sw/source/filter/html/htmlplug.cxx |8 +++-
 sw/source/filter/html/wrthtml.hxx  |4 ++--
 unusedcode.easy|7 ---
 7 files changed, 34 insertions(+), 37 deletions(-)

New commits:
commit 3852a6f54880af8ed9161227baa80c7d4517
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Oct 27 22:02:37 2011 +0100

ByteString-rtl::OString

diff --git a/sw/source/filter/html/htmldraw.cxx 
b/sw/source/filter/html/htmldraw.cxx
index 0c757e0..ca3695b 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -837,11 +837,10 @@ Writer OutHTML_DrawFrmFmtAsMarquee( Writer rWrt,
 rWrt.Strm()  sOut.makeStringAndClear().getStr();
 
 // und nun noch ALIGN, HSPACE und VSPACE
-ByteString aEndTags;
 sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
 if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
 nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
-rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, aEndTags, nFrmFlags );
+rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, 
nFrmFlags );
 if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
 rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, rSdrObject );
 
@@ -859,8 +858,8 @@ Writer OutHTML_DrawFrmFmtAsMarquee( Writer rWrt,
 
 HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, 
sal_False );
 
-if( aEndTags.Len() )
-rWrt.Strm()  aEndTags.GetBuffer();
+if( aEndTags.getLength() )
+rWrt.Strm()  aEndTags.getStr();
 
 return rWrt;
 }
diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index c4e81e7..0ef3d6c 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -542,11 +542,12 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const 
SwFrmFmt rFrmFmt,
 }
 
 
-void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt rFrmFmt,
+rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt rFrmFmt,
  const String rAlternateTxt,
- ByteString rEndTags,
- sal_uInt32 nFrmOpts )
+ sal_uInt32 nFrmOpts,
+ const rtl::OString rEndTags )
 {
+rtl::OString sRetEndTags;
 rtl::OStringBuffer sOut;
 const SfxPoolItem* pItem;
 const SfxItemSet rItemSet = rFrmFmt.GetAttrSet();
@@ -820,9 +821,10 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt 
rFrmFmt,
 sOut.append('').append(OOO_STRING_SVTOOLS_HTML_linebreak).
 append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).
 append('=').append(pStr).append('').append(rEndTags);
-rEndTags = sOut.makeStringAndClear().getStr();
+sRetEndTags = sOut.makeStringAndClear();
 }
 }
+return sRetEndTags;
 }
 
 
@@ -995,7 +997,7 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt 
rFrmFmt,
 
 // Attribute die ausserhelb der Grafik geschreiben werden muessen sammeln
 rtl::OStringBuffer sOut;
-ByteString aEndTags;
+rtl::OString aEndTags;
 
 // implizite Sprungmarke - A NAME=.../A...IMG ...
 if( pMarkType  rFrmFmt.GetName().Len() )
@@ -1168,7 +1170,7 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt 
rFrmFmt,
 }
 
 // ALT, ALIGN, WIDTH, HEIGHT, HSPACE, VSPACE
-rHTMLWrt.OutFrmFmtOptions( rFrmFmt, rAlternateTxt, aEndTags, nFrmOpts );
+aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, rAlternateTxt, nFrmOpts, 
aEndTags );
 if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
 rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
 
@@ -1195,8 +1197,8 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt 
rFrmFmt,
 
 rHTMLWrt.Strm()  '';
 
-if( aEndTags.Len() )
-rWrt.Strm()  aEndTags.GetBuffer();
+if( aEndTags.getLength() )
+rWrt.Strm()  aEndTags.getStr();
 
 if( rHTMLWrt.aINetFmts.Count() )
 {
@@ -1437,8 +1439,7 @@ static Writer  OutHTML_FrmFmtAsMulticol( Writer rWrt,
 : HTML_FRMOPTS_MULTICOL;
 if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY )  !bInCntnr )
 nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
-ByteString aEndTags;
-rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, aEndTags, nFrmFlags );
+rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
 if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY )  !bInCntnr )
 rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
 
@@ -1486,13 +1487,11 @@ static Writer OutHTML_FrmFmtAsSpacer( Writer rWrt, 
const SwFrmFmt rFrmFmt )
 rWrt.Strm()  sOut.makeStringAndClear().getStr();
 
 // ALIGN, WIDTH, HEIGHT
-ByteString aEndTags;
-

[Libreoffice-commits] .: 2 commits - oox/inc oox/source sc/inc sc/source

2011-10-27 Thread Markus Mohrhard 
 oox/inc/oox/xls/workbookhelper.hxx |8 
 oox/source/xls/defnamesbuffer.cxx  |   11 ---
 oox/source/xls/workbookhelper.cxx  |   37 +
 sc/inc/nameuno.hxx |   10 ++
 sc/source/ui/unoobj/nameuno.cxx|   21 +++--
 5 files changed, 66 insertions(+), 21 deletions(-)

New commits:
commit 67315dcfb0664a35fdd34f86242452bc27df6105
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Oct 27 23:53:34 2011 +0200

use uno for local range name api, it crashs otherwise sometimes

diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 9d7ca93..c082226 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -38,6 +38,7 @@
 #include com/sun/star/sheet/XNamedRange.hpp
 #include com/sun/star/sheet/XFormulaTokens.hpp
 #include com/sun/star/sheet/XNamedRanges.hpp
+#include com/sun/star/container/XNamed.hpp
 #include com/sun/star/container/XEnumerationAccess.hpp
 #include com/sun/star/lang/XServiceName.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
@@ -69,7 +70,7 @@ private:
 ScNamedRangesObj*   mpParent;
 ScDocShell* pDocShell;
 String  aName;
-ScTableSheetObj*mpSheet;
+com::sun::star::uno::Reference com::sun::star::container::XNamed  
mxSheet;
 
 private:
 ScRangeData*GetRangeData_Impl();
@@ -80,7 +81,8 @@ private:
 SCTAB   GetTab_Impl();
 
 public:
-ScNamedRangeObj(ScNamedRangesObj* pParent, 
ScDocShell* pDocSh, const String rNm, ScTableSheetObj* pSheet = NULL);
+ScNamedRangeObj(ScNamedRangesObj* pParent, 
ScDocShell* pDocSh, const String rNm,
+com::sun::star::uno::Reference 
com::sun::star::container::XNamed  xSheet = com::sun::star::uno::Reference 
com::sun::star::container::XNamed  ());
 virtual ~ScNamedRangeObj();
 
 virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint 
);
@@ -337,9 +339,9 @@ private:
 virtual ScRangeName*GetRangeName_Impl();
 virtual SCTAB   GetTab_Impl();
 
-ScTableSheetObj* mpSheet;
+::com::sun::star::uno::Reference ::com::sun::star::container::XNamed  
mxSheet;
 public:
-ScLocalNamedRangesObj(ScDocShell* pDocSh, 
ScTableSheetObj* pSheet);
+ScLocalNamedRangesObj(ScDocShell* pDocSh, 
::com::sun::star::uno::Reference com::sun::star::container::XNamed  xNamed );
 virtual ~ScLocalNamedRangesObj();
 };
 
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 3726eb7..7e9a52d 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -99,11 +99,11 @@ bool lcl_UserVisibleName(const ScRangeData rData)
 return !rData.HasType(RT_DATABASE)  !rData.HasType(RT_SHARED);
 }
 
-ScNamedRangeObj::ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* 
pDocSh, const String rNm, ScTableSheetObj* pSheet) :
+ScNamedRangeObj::ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* 
pDocSh, const String rNm, Referencecontainer::XNamed xSheet):
 mpParent(pParent),
 pDocShell( pDocSh ),
 aName( rNm ),
-mpSheet( pSheet )
+mxSheet( xSheet )
 {
 pDocShell-GetDocument()-AddUnoObject(*this);
 }
@@ -147,13 +147,14 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl()
 
 SCTAB ScNamedRangeObj::GetTab_Impl()
 {
-if (mpSheet)
+if (mxSheet.is())
 {
 if (!pDocShell)
 return -2;
 ScDocument* pDoc = pDocShell-GetDocument();
 SCTAB nTab;
-pDoc-GetTable(mpSheet-getName(), nTab);
+rtl::OUString sName = mxSheet-getName();
+pDoc-GetTable(sName, nTab);
 return nTab;
 }
 else
@@ -922,9 +923,9 @@ SCTAB ScGlobalNamedRangesObj::GetTab_Impl()
 
 //
 
-ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, 
ScTableSheetObj* pSheet )
+ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, 
uno::Referencecontainer::XNamed xSheet )
 : ScNamedRangesObj(pDocSh),
-mpSheet(pSheet)
+mxSheet(xSheet)
 {
 
 }
@@ -937,7 +938,7 @@ ScLocalNamedRangesObj::~ScLocalNamedRangesObj()
 ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const 
::rtl::OUString aName)
 {
 if ( pDocShell  hasByName( aName ) )
-return new ScNamedRangeObj( this, pDocShell, String(aName), mpSheet);
+return new ScNamedRangeObj( this, pDocShell, String(aName), mxSheet);
 return NULL;
 
 }
@@ -947,7 +948,7 @@ ScNamedRangeObj* 
ScLocalNamedRangesObj::GetObjectByIndex_Impl( sal_uInt16 nIndex
 if (!pDocShell)
 return NULL;
 
-rtl::OUString aName = mpSheet-getName();
+rtl::OUString aName = mxSheet-getName();
 ScDocument* pDoc = pDocShell-GetDocument();
 SCTAB nTab;
 pDoc-GetTable( aName, nTab );
@@ -963,7 +964,7

[Libreoffice-commits] .: sc/qa

2011-10-27 Thread Markus Mohrhard 
 sc/qa/unit/data/xlsx/named-ranges-global.xlsx |binary
 sc/qa/unit/filters-test.cxx   |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9730ec265c4aeab6724741d66d17c6b44f307ed
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Oct 28 00:00:34 2011 +0200

we can now enable the range name test for xlsx too

diff --git a/sc/qa/unit/data/xlsx/named-ranges-global.xlsx 
b/sc/qa/unit/data/xlsx/named-ranges-global.xlsx
new file mode 100644
index 000..a1ae8e7
Binary files /dev/null and b/sc/qa/unit/data/xlsx/named-ranges-global.xlsx 
differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 71a4339..059ef17 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -299,7 +299,7 @@ void ScFiltersTest::testRangeName()
 {
 const rtl::OUString 
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(named-ranges-global.));
 //XLSX does not work yet
-for (sal_uInt32 i = 0; i  2; ++i)
+for (sal_uInt32 i = 0; i  3; ++i)
 {
 rtl::OUString aFileExtension(aFileFormats[i].pName, 
strlen(aFileFormats[i].pName), RTL_TEXTENCODING_UTF8 );
 rtl::OUString aFilterName(aFileFormats[i].pFilterName, 
strlen(aFileFormats[i].pFilterName), RTL_TEXTENCODING_UTF8) ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-10-27 Thread Norbert Thiebaud 
 sw/source/core/doc/acmplwrd.cxx |   32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)

New commits:
commit d1932bfb76fc6bafa94fd56ddf5ac74a28f62fb2
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Fri Oct 28 02:23:02 2011 +0200

Translate German comments

diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 4dc51b1..3e9bc8d 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -288,8 +288,8 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String 
rWord, SwDoc rDoc )
 aLRULst.Insert( pNew, 0 );
 else
 {
-// der letzte muss entfernt werden
-// damit der neue vorne Platz hat
+// the last one needs to be removed
+// so that there is space for the first one
 String* pDel = (String*)aLRULst[ nMaxCount - 1 ];
 
 void** ppData = (void**)aLRULst.GetData();
@@ -303,15 +303,15 @@ sal_Bool SwAutoCompleteWord::InsertWord( const String 
rWord, SwDoc rDoc )
 else
 {
 delete (SwAutoCompleteString*)pNew;
-// dann aber auf jedenfall nach oben moven
+// then move up
 pNew = aWordLst[ nInsPos ];
 
-//add the document to the already inserted string
+// add the document to the already inserted string
 SwAutoCompleteString* pCurrent = (SwAutoCompleteString*)pNew;
 pCurrent-AddDocument(rDoc);
 
 nInsPos = aLRULst.GetPos( (void*)pNew );
-OSL_ENSURE( USHRT_MAX != nInsPos, String nicht gefunden );
+OSL_ENSURE( USHRT_MAX != nInsPos, String not found );
 if( nInsPos )
 {
 void** ppData = (void**)aLRULst.GetData();
@@ -327,12 +327,12 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
 {
 if( nNewMax  nMaxCount  aLRULst.Count()  nNewMax )
 {
-// dann die unten ueberhaengenden entfernen
+// remove the trailing ones
 sal_uInt16 nLRUIndex = nNewMax-1;
 while( nNewMax  aWordLst.Count()  nLRUIndex  aLRULst.Count())
 {
 sal_uInt16 nPos = aWordLst.GetPos( (String*)aLRULst[ nLRUIndex++ ] 
);
-OSL_ENSURE( USHRT_MAX != nPos, String nicht gefunden );
+OSL_ENSURE( USHRT_MAX != nPos, String not found );
 void * pDel = aWordLst[nPos];
 aWordLst.Remove(nPos);
 delete (SwAutoCompleteString*)pDel;
@@ -344,11 +344,7 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
 
 void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
 {
-// will man wirklich alle Worte, die kleiner als die neue Min Laenge
-// sind entfernen?
-// JP 02.02.99 - erstmal nicht.
-
-// JP 11.03.99 - mal testhalber eingebaut
+// Do you really want to remove all words that are less than the minWrdLen?
 if( n  nMinWrdLen )
 {
 for( sal_uInt16 nPos = 0; nPos  aWordLst.Count(); ++nPos  )
@@ -358,7 +354,7 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
 aWordLst.Remove(nPos);
 
 sal_uInt16 nDelPos = aLRULst.GetPos( pDel );
-OSL_ENSURE( USHRT_MAX != nDelPos, String nicht gefunden );
+OSL_ENSURE( USHRT_MAX != nDelPos, String not found );
 aLRULst.Remove( nDelPos );
 --nPos;
 delete (SwAutoCompleteString*)pDel;
@@ -396,26 +392,26 @@ void SwAutoCompleteWord::CheckChangedList( const 
SvStringsISortDtor rNewLst )
 aWordLst.Remove(nMyPos);
 
 sal_uInt16 nPos = aLRULst.GetPos( pDel );
-OSL_ENSURE( USHRT_MAX != nPos, String nicht gefunden );
+OSL_ENSURE( USHRT_MAX != nPos, String not found );
 aLRULst.Remove( nPos );
 delete (SwAutoCompleteString*)pDel;
 if( nMyPos = --nMyLen )
 break;
 }
 }
-//remove the elements at the end of the array
+// remove the elements at the end of the array
 if( nMyPos  nMyLen )
 {
-//clear LRU array first then delete the string object
+// clear LRU array first then delete the string object
 for( ; nNewPos  nMyLen; ++nNewPos )
 {
 void* pDel = aWordLst[ nNewPos ];
 sal_uInt16 nPos = aLRULst.GetPos( pDel );
-OSL_ENSURE( USHRT_MAX != nPos, String nicht gefunden );
+OSL_ENSURE( USHRT_MAX != nPos, String not found );
 aLRULst.Remove( nPos );
 delete (SwAutoCompleteString*)pDel;
 }
-//remove from array
+// remove from array
 aWordLst.Remove( nMyPos, nMyLen - nMyPos );
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits