[Libreoffice-commits] .: connectivity/source

2012-03-03 Thread Julien Nabet
 connectivity/source/drivers/postgresql/pq_tools.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a8710409fbf69fb4c3e175c1a17d72ea06576ef
Author: Julien Nabet 
Date:   Sat Mar 3 23:41:06 2012 +0100

Fix lacking break in switch

diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx 
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 56aed72..84d9741 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -518,6 +518,7 @@ static bool isOperator( char c )
 case '?':
 case '$':
 ret = true;
+break;
 default:
 ret = false;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: extensions/Module_extensions.mk extensions/source np_sdk/Module_np_sdk.mk Repository.mk

2012-03-03 Thread Matus Kukan
 Repository.mk|   15 ---
 extensions/Module_extensions.mk  |   16 
 extensions/source/nsplugin/source/nsplugin_oo.rc |   46 +++
 np_sdk/Module_np_sdk.mk  |2 -
 4 files changed, 63 insertions(+), 16 deletions(-)

New commits:
commit 8829b7c91d2798bc91061ab81b32a08555785482
Author: Matúš Kukan 
Date:   Sat Mar 3 16:35:52 2012 +0100

build nsplugin also without mozilla as in 3-5 branch

diff --git a/Repository.mk b/Repository.mk
index a18cff9..9d6ed21 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -124,13 +124,6 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\
 
 endif
 
-ifeq ($(WITH_MOZILLA),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-pluginapp.bin \
-))
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-pl \
-))
 ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
 nsplugin \
@@ -139,6 +132,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 npsoplugin \
 ))
 endif
+
+ifeq ($(WITH_MOZILLA),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+pluginapp.bin \
+))
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+pl \
+))
 endif # WITH_MOZILLA
 
 
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index d0490ea..97ad06d 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -90,6 +90,14 @@ endif # DISABLE_ATL
 
 endif # WNT
 
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+   Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
+))
+endif
+
 ifeq ($(WITH_MOZILLA),YES)
 
 $(eval $(call gb_Module_add_targets,extensions,\
@@ -104,14 +112,6 @@ $(eval $(call gb_Module_add_targets,extensions,\
 endif
 endif
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Executable_nsplugin \
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
-))
-endif
-
 endif # WITH_MOZILLA=YES
 
 ifeq ($(OS),MACOSX)
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc 
b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 1fc8285..ba09335 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -28,3 +28,49 @@
 VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 
- 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 
5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 
5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet 
Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 
6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 
Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master 
Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument 
Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument 
Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument 
Drawing Template|OpenDocument Presentation|OpenDocument Presentation 
Template|OpenDocument Formula\0"
 #define ADDITIONAL_VERINFO2VALUE "FileDescription", "LibreOffice Plug-in 
handles all its documents" VALUE "ProductName", "LibreOffice Plug-in"  VALUE 
"MIMEType",   
"application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
 #define ADDITIONAL_VERINFO3 
"application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
+#define VERVARIANT 3
+#define ORG_NAME npsoplugin.dll
+#define RES_APP_VENDOR
+#define INTERNAL_NAME npsoplugin
+
+#include 
+#include "version.hrc"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
+PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+FILEFLAGSM

[Libreoffice-commits] .: vcl/unx

2012-03-03 Thread Lucas Baudin
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1cf3e446744ae679bc89b39dcbbcf6b4e9821f3a
Author: Lucas Baudin 
Date:   Sat Mar 3 15:44:54 2012 +0100

gtk3: Avoid crash with some themes (unico based)

We didn't check wether the window was big enough to draw all the widgets. 
Sometimes, when the window was displaying, it was too small and drawing outside 
of the window caused a crash, we didn't take into account that the root point 
for drawing gtk3 widgets wasn't always (0,0).

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 95aa313..6bfad00 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1002,8 +1002,10 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
 
 unsigned char *src = data.get();
 src += (int)ay * nStride + (int)ax * 3;
+awidth = MIN (region->width, size.getX() - ax);
+aheight = MIN (region->height, size.getY() - ay);
 
-for (int y = 0; y < size.getY(); ++y)
+for (int y = 0; y < aheight; ++y)
 {
 for (int x = 0; x < awidth && y < aheight; ++x)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: hwpfilter/source oox/source sax/source unoxml/source

2012-03-03 Thread Julien Nabet
 hwpfilter/source/hwpreader.hxx   |2 +-
 oox/source/drawingml/shape.cxx   |4 ++--
 sax/source/fastparser/facreg.cxx |4 ++--
 unoxml/source/dom/saxbuilder.cxx |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5122196acc2e8e9d8e71dad3d941b373b09e0b03
Author: Julien Nabet 
Date:   Sat Mar 3 15:05:28 2012 +0100

Avoid temporary rtl::OUString

diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 6a7ce4f..62205a7 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -351,7 +351,7 @@ extern "C"
 
 OUString aImplementationName = OUString::createFromAscii( 
pImplName );
 
-if (aImplementationName == OUString(RTL_CONSTASCII_USTRINGPARAM( 
IMPLEMENTATION_NAME )) )
+if (aImplementationName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( 
IMPLEMENTATION_NAME )) )
 {
 xRet = createSingleFactory( xSMgr, aImplementationName,
 HwpImportFilter_CreateInstance,
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2b2d815..a2e29c5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -383,7 +383,7 @@ Reference< XShape > Shape::createAndInsert(
 aTransformation.scale(1/360.0, 1/360.0);
 
 // special for lineshape
-if ( aServiceName == 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")) )
+if ( 
aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.LineShape"))
 )
 {
 ::basegfx::B2DPolygon aPoly;
 aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -404,7 +404,7 @@ Reference< XShape > Shape::createAndInsert(
 
 maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
 }
-else if ( aServiceName == 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")) )
+else if ( 
aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ConnectorShape"))
 )
 {
 ::basegfx::B2DPolygon aPoly;
 aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index 2f0eba3..35db3e1 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -52,13 +52,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
fastsax_component_getFactory(
 
 OUString aImplementationName( OUString::createFromAscii( pImplName ) );
 
-if (aImplementationName == OUString( RTL_CONSTASCII_USTRINGPARAM( 
PARSER_IMPLEMENTATION_NAME  ) ) )
+if (aImplementationName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
PARSER_IMPLEMENTATION_NAME  ) ) )
 {
 xRet = createSingleFactory( xSMgr, aImplementationName,
 FastSaxParser_CreateInstance,
 
FastSaxParser::getSupportedServiceNames_Static() );
 }
-else if (aImplementationName == OUString( RTL_CONSTASCII_USTRINGPARAM( 
SERIALIZER_IMPLEMENTATION_NAME  ) ) )
+else if (aImplementationName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
SERIALIZER_IMPLEMENTATION_NAME  ) ) )
 {
 xRet = createSingleFactory( xSMgr, aImplementationName,
 FastSaxSerializer_CreateInstance,
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index fb79fff..f91851b 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -231,7 +231,7 @@ namespace DOM
 newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
 aNSMap.insert(NSMap::value_type(newprefix, attr_value));
 }
-else if (attr_qname == 
OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns")))
+else if 
(attr_qname.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xmlns")))
 {
 // new default prefix
 aNSMap.insert(NSMap::value_type(OUString(), attr_value));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: lotuswordpro/source sw/source writerfilter/source

2012-03-03 Thread Julien Nabet
 lotuswordpro/source/filter/lwpfilter.cxx |   16 
 sw/source/filter/ww8/rtfimportfilter.cxx |2 +-
 writerfilter/source/filter/WriterFilterDetection.cxx |2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 39c2a52d198f513c2f5afbd38dd9b14bff388d6e
Author: Julien Nabet 
Date:   Sat Mar 3 14:56:17 2012 +0100

Avoid temporary rtl::OUString

diff --git a/lotuswordpro/source/filter/lwpfilter.cxx 
b/lotuswordpro/source/filter/lwpfilter.cxx
index 1f66f94..dc2bfee 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -114,7 +114,7 @@ sal_Bool LWPFilterReader::filter( const Sequence< 
PropertyValue >& aDescriptor )
 for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
 {
 //Note we should attempt to use "InputStream" if it exists first!
-if( aDescriptor[i].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+if( 
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
 aDescriptor[i].Value >>= sURL;
 }
 
@@ -218,11 +218,11 @@ Sequence< OUString> 
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
 sal_Int32 nPropertyCount = aDescriptor.getLength();
  for( sal_Int32 nProperty=0; nProperty>= aTypeName;
 }
-else if( aDescriptor[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate")) )
+else if( 
aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AsTemplate"))
 )
 {
 bOpenAsTemplate = sal_True;
 }
@@ -232,17 +232,17 @@ Sequence< OUString> 
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
 {
 OUString strTemp;
 aDescriptor[i].Value >>= strTemp;
-if( aDescriptor[i].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
+if( 
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")) )
 {
 uno::Reference< XInputStream> rInputStream;
 aDescriptor[i].Value >>= rInputStream;
 //
-// TRANSFORM IMPLEMENTATION HERE!!
+// TODO TRANSFORM IMPLEMENTATION HERE!!
 // and call m_DocumentHandler's SAX mDochods
 //
 if( IsWordproFile(rInputStream) )
 {
-if( aTypeName == 
OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template")) )
+if( 
aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
 {
 if(!bOpenAsTemplate)
 {
@@ -259,7 +259,7 @@ Sequence< OUString> 
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
 }
 return ret;
 }
-else if( aDescriptor[i].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+else if( 
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
 {
 OUStringsURL;
 OUStringsFileName;
@@ -277,7 +277,7 @@ Sequence< OUString> 
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
 //end with .lwp:
 if( IsWordproFile(sURL) )
 {
-if( aTypeName == 
OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template")) )
+if( 
aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("wordpro_template")) )
 {
 if(!bOpenAsTemplate)
 {
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx 
b/sw/source/filter/ww8/rtfimportfilter.cxx
index 25f0a78..e3b553b 100644
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ b/sw/source/filter/ww8/rtfimportfilter.cxx
@@ -84,7 +84,7 @@ sal_Bool RtfImportFilter::filter( const uno::Sequence< 
beans::PropertyValue >& a
 OUString sTemp;
 for ( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
 {
-if( aDescriptor[i].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+if( 
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
 {
 aDescriptor[i].Value >>= sTemp;
 aURL = sTemp;
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx 
b/writerfilter/source/filter/WriterFilterDetection.cxx
index ff2e22e..f9d9ca4 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -71,7 +71,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< 
beans::PropertyValue >& r
 uno::Reference < io::XInputStream > xInputStream;
 for( sal_Int32 nProperty = 0; nProperty < nPropertyCount; ++nProperty )
 {
-if( pValues[nProperty].Name == 
OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")) )
+if( 
pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TypeName")) )
 rDescriptor[nProperty].Value >>= sTypeName;
 else if( 
pValues[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_S

[Libreoffice-commits] .: 5 commits - svtools/inc svtools/source

2012-03-03 Thread Matteo Casalin
 svtools/inc/svtools/valueset.hxx|8 
 svtools/source/control/valueacc.cxx |   11 -
 svtools/source/control/valueimp.hxx |6 
 svtools/source/control/valueset.cxx |  312 
 4 files changed, 193 insertions(+), 144 deletions(-)

New commits:
commit e336f41e50ea96880dd71a2b42aa37cf53256383
Author: Matteo Casalin 
Date:   Tue Feb 28 00:06:24 2012 +0100

ValueSet: simplified autoscroll logic

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 9db8f93..8cd032b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -994,46 +994,35 @@ void ValueSet::ImplDraw()
 
 bool ValueSet::ImplScroll( const Point& rPos )
 {
-Size aOutSize = GetOutputSizePixel();
-long nScrBarWidth;
-
-if ( mpScrBar )
-nScrBarWidth = mpScrBar->GetSizePixel().Width();
-else
-nScrBarWidth = 0;
-
-if ( !mbScroll || (rPos.X() < 0) || (rPos.X() > 
aOutSize.Width()-nScrBarWidth) )
+if ( !mbScroll || !maItemListRect.IsInside(rPos) )
 return false;
 
-long nScrollOffset;
-sal_uInt16   nOldLine = mnFirstLine;
-const Rectangle aTopRect = ImplGetItemRect( mnFirstLine*mnCols );
-if ( aTopRect.GetHeight() <= 16 )
-nScrollOffset = SCROLL_OFFSET/2;
-else
-nScrollOffset = SCROLL_OFFSET;
-if ( (mnFirstLine > 0) && (rPos.Y() >= 0) )
+const long nScrollOffset = (mnItemHeight <= 16) ? SCROLL_OFFSET/2 : 
SCROLL_OFFSET;
+bool bScroll = false;
+
+if ( rPos.Y() <= maItemListRect.Top()+nScrollOffset )
 {
-long nTopPos = aTopRect.Top();
-if ( (rPos.Y() >= nTopPos) && (rPos.Y() <= nTopPos+nScrollOffset) )
-mnFirstLine--;
+if ( mnFirstLine > 0 )
+{
+--mnFirstLine;
+bScroll = true;
+}
 }
-if ( (mnFirstLine == nOldLine) &&
- (mnFirstLine < (sal_uInt16)(mnLines-mnVisLines)) && (rPos.Y() < 
aOutSize.Height()) )
+else if ( rPos.Y() >= maItemListRect.Bottom()-nScrollOffset )
 {
-const long nBottomPos = 
ImplGetItemRect((mnFirstLine+mnVisLines-1)*mnCols).Bottom();
-if ( (rPos.Y() >= nBottomPos-nScrollOffset) && (rPos.Y() <= 
nBottomPos) )
-mnFirstLine++;
+if ( mnFirstLine < static_cast(mnLines-mnVisLines) )
+{
+++mnFirstLine;
+bScroll = true;
+}
 }
 
-if ( mnFirstLine != nOldLine )
-{
-mbFormat = true;
-ImplDraw();
-return true;
-}
-else
+if ( !bScroll )
 return false;
+
+mbFormat = true;
+ImplDraw();
+return true;
 }
 
 // ---
commit 0809906906d7941ceb9ae170a41c482fdd1e6bfa
Author: Matteo Casalin 
Date:   Sun Feb 26 22:47:10 2012 +0100

ValueSet: reduce memory footprint by dynamically evaluating rectangles

diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 7e0b7db..22271da 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -217,6 +217,10 @@ private:
 ValueItemList   mItemList;
 ValueSetItem*   mpNoneItem;
 ScrollBar*  mpScrBar;
+Rectangle   maNoneItemRect;
+Rectangle   maItemListRect;
+longmnItemWidth;
+longmnItemHeight;
 longmnTextOffset;
 longmnVisLines;
 longmnLines;
@@ -241,6 +245,7 @@ private:
 boolmbScroll : 1;
 boolmbFullMode : 1;
 boolmbIsTransientChildrenDisabled : 1;
+boolmbHasVisibleItems : 1;
 Color   maColor;
 LinkmaDoubleClickHdl;
 LinkmaSelectHdl;
@@ -255,7 +260,7 @@ private:
 SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool 
bForeground, bool bBackground );
 SVT_DLLPRIVATE void ImplInitScrollBar();
 SVT_DLLPRIVATE void ImplDeleteItems();
-SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem );
+SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem, Rectangle 
aRect );
 SVT_DLLPRIVATE void ImplDrawItemText( const XubString& rStr );
 SVT_DLLPRIVATE void ImplDrawSelect( sal_uInt16 nItemId, const bool 
bFocus, const bool bDrawSel );
 SVT_DLLPRIVATE void ImplDrawSelect();
@@ -270,6 +275,7 @@ private:
 SVT_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SVT_DLLPRIVATE ValueSetItem*ImplGetVisibleItem( sal_uInt16 nVisiblePos 
);
 SVT_DLLPRIVATE void ImplInsertItem( ValueSetItem *const pItem, 
const size_t nPos );
+SVT_DLLPRIVATE RectangleImplGetItemRect( size_t nPos ) const;
 SVT_DLLPRIVATE voidImplFireAccessibleEvent( short nEventId, 
const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
 SVT_DLLPRIVATE bool