date:20111020

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

2011-10-20 Thread Jan Holesovsky

 formula/inc/formula/formula.hxx   |   17 -
 formula/source/ui/dlg/formula.cxx |   70 --
 unusedcode.easy   |   14 ---
 3 files changed, 101 deletions(-)

New commits:
commit 9f562a82c6ed56824365825a6bc0acf313ebcf28
Author: Felix Zhang fezh...@suse.com
Date:   Thu Oct 20 15:51:38 2011 +0800

remove unused methods from formula::FormulaModalDialog

diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 32643b5..e846ae8 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -74,34 +74,17 @@ private:
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
 protected:
-voiddisableOk();
-
-protected:
 
 virtual longPreNotify( NotifyEvent rNEvt );
 ::std::pairRefButton*,RefEdit* RefInputStartBefore( RefEdit* pEdit, 
RefButton* pButton = NULL );
 voidRefInputStartAfter( RefEdit* pEdit, RefButton* pButton = 
NULL );
 voidRefInputDoneAfter( sal_Bool bForced = sal_False );
-rtl::OStringFindFocusWin(Window *pWin);
 voidSetFocusWin(Window *pWin,const rtl::OString nUniqueId);
-voidHighlightFunctionParas(const String aFormula);
 
 voidSetMeText(const String _sText);
-FormulaDlgMode SetMeText(const String _sText,xub_StrLen PrivStart, 
xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
 voidUpdate();
 sal_BoolCheckMatrix(String aFormula /*IN/OUT*/);
-String  GetMeText() const;
 voidUpdate(const String _sExp);
-voidCheckMatrix();
-voidDoEnter(sal_Bool _bOk);
-sal_BoolisUserMatrix() const;
-const IFunctionDescription* getCurrentFunctionDescription() const;
-sal_BoolUpdateParaWin(Selection _rSelection);
-voidUpdateParaWin(const Selection _rSelection,const String 
_sRefStr);
-RefEdit*GetActiveEdit();
-voidSetEdSelection();
-
-const FormulaHelper GetFormulaHelper() const;
 };
 
 class FORMULA_DLLPUBLIC FormulaDlg :   public SfxModelessDialog
diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index f82ee9b..97ef663 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1823,44 +1823,15 @@ void FormulaModalDialog::SetMeText(const String _sText)
 }
 
 // 
-
-FormulaDlgMode FormulaModalDialog::SetMeText(const String _sText,xub_StrLen 
PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool 
_bUpdate)
-{
-return m_pImpl-SetMeText(_sText,PrivStart, 
PrivEnd,bMatrix,_bSelect,_bUpdate);
-}
-// 
-
-void FormulaModalDialog::CheckMatrix()
-{
-m_pImpl-aBtnMatrix.Check();
-}
-// 
-
 sal_Bool FormulaModalDialog::CheckMatrix(String aFormula)
 {
 return m_pImpl-CheckMatrix(aFormula);
 }
 // 
-
-String FormulaModalDialog::GetMeText() const
-{
-return m_pImpl-pMEdit-GetText();
-}
-// 
-
 void FormulaModalDialog::Update()
 {
 m_pImpl-Update();
 }
-// 
-
-const FormulaHelper FormulaModalDialog::GetFormulaHelper() const
-{
-return m_pImpl-GetFormulaHelper();
-}
-// 
-
-sal_Bool FormulaModalDialog::isUserMatrix() const
-{
-return m_pImpl-bUserMatrixFlag;
-}
-void FormulaModalDialog::DoEnter(sal_Bool _bOk)
-{
-m_pImpl-DoEnter(_bOk);
-}
 ::std::pairRefButton*,RefEdit* FormulaModalDialog::RefInputStartBefore( 
RefEdit* pEdit, RefButton* pButton )
 {
 return m_pImpl-RefInputStartBefore( pEdit, pButton );
@@ -1874,11 +1845,6 @@ void FormulaModalDialog::RefInputDoneAfter( sal_Bool 
bForced )
 m_pImpl-RefInputDoneAfter( bForced );
 }
 
-rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin)
-{
-return m_pImpl-FindFocusWin( pWin );
-}
-
 void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString 
nUniqueId)
 {
 if(pWin-GetUniqueId()==nUniqueId)
@@ -1897,7 +1863,6 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const 
rtl::OString nUniqueId)
 }
 }
 
-
 long FormulaModalDialog::PreNotify( NotifyEvent rNEvt )
 {
 m_pImpl-PreNotify( rNEvt );
@@ -1905,41 +1870,6 @@ long FormulaModalDialog::PreNotify( NotifyEvent rNEvt )
 return ModalDialog::PreNotify(rNEvt);
 }
 
-void FormulaModalDialog::HighlightFunctionParas(const String aFormula)
-{
-m_pImpl-m_pHelper-showReference(aFormula);
-}
-
-void FormulaModalDialog::disableOk()
-{
-

[Libreoffice-commits] .: sc/source

2011-10-20 Thread Caolán McNamara

 sc/source/filter/excel/xlroot.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8eb50d3b4be4df15f830e4b36449c9fcf05aa71b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Oct 20 09:34:31 2011 +0100

WaE: unused e

diff --git a/sc/source/filter/excel/xlroot.cxx 
b/sc/source/filter/excel/xlroot.cxx
index 7241852..f94d162 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -162,7 +162,11 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium 
rMedium,
 }
 catch( const Exception e)
 {
+#if OSL_DEBUG_LEVEL  0
 OSL_FAIL( rtl::OStringBuffer(XclRootData::XclRootData - cannot get 
output device info: 
).append(rtl::OUStringToOString(e.Message,osl_getThreadTextEncoding())).getStr()
 );
+#else
+(void)e;
+#endif
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-20 Thread Cédric Bosdonnat

 drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx |6 +++
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx   |9 
+++--
 drawinglayer/source/processor2d/vclprocessor2d.cxx  |7 +++
 svtools/inc/svtools/borderhelper.hxx|3 +
 svtools/source/control/ctrlbox.cxx  |   18 
++
 5 files changed, 40 insertions(+), 3 deletions(-)

New commits:
commit 8c2902ecbf135fae070ea032fa10a59bb76ec1b0
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Oct 20 11:03:54 2011 +0200

fdo#37129: Fix the drawing of dotted and dashed borders in Calc.

diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 0bd537d..1449e2b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -35,6 +35,7 @@
 #include basegfx/color/bcolor.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include basegfx/polygon/b2dpolypolygon.hxx
+#include svtools/ctrlbox.hxx
 
 //
 
@@ -112,6 +113,11 @@ namespace drawinglayer
 return basegfx::fTools::equal(1.0, mfRightWidth);
 }
 
+bool isSolidLine() const
+{
+return (mnStyle==STYLE_SOLID);
+}
+
 bool isInsideUsed() const
 {
 return !basegfx::fTools::equalZero(mfLeftWidth);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 9738e14..df6f381 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include precompiled_drawinglayer.hxx
 
+#include drawinglayer/geometry/viewinformation2d.hxx
 #include drawinglayer/primitive2d/borderlineprimitive2d.hxx
 #include drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
 #include basegfx/polygon/b2dpolygon.hxx
@@ -79,7 +80,7 @@ namespace drawinglayer
 return basegfx::B2DPolyPolygon( clipPolygon );
 }
 
-Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D /*rViewInformation*/) const
+Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D rViewInformation) const
 {
 Primitive2DSequence xRetval;
 
@@ -214,6 +215,7 @@ namespace drawinglayer
 
 // Get which is the line to show
 bool bIsHairline = leftIsHairline();
+bool bIsSolidline = isSolidLine();
 double nWidth = getCorrectedLeftWidth();
 basegfx::BColor aColor = getRGBColorLeft();
 if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) )
@@ -223,7 +225,7 @@ namespace drawinglayer
 aColor = getRGBColorRight();
 }
 
-if(bIsHairline)
+if(bIsHairline  bIsSolidline)
 {
 // create hairline primitive
 aPolygon.append( getStart() );
@@ -237,12 +239,13 @@ namespace drawinglayer
 {
 // create filled polygon primitive
 const basegfx::B2DVector aLineWidthOffset(((nWidth + 
1) * 0.5) * aPerpendicular);
+basegfx::B2DVector aScale( 
rViewInformation.getInverseObjectToViewTransformation() * aVector );
 
 aPolygon.append( aTmpStart );
 aPolygon.append( aTmpEnd );
 
 basegfx::B2DPolyPolygon aDashed = 
svtools::ApplyLineDashing(
-   aPolygon, getStyle(), MAP_100TH_MM );
+   aPolygon, getStyle(), MAP_PIXEL, 
aScale.getLength() );
 for (sal_uInt32 i = 0; i  aDashed.count(); i++ )
 {
 basegfx::B2DPolygon aDash = aDashed.getB2DPolygon( 
i );
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index a13ca70..c021519 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -837,6 +837,10 @@ namespace drawinglayer
 }
 else
 {
+// remember that we enter a PolygonStrokePrimitive2D 
decomposition,
+// used for AA thick line drawing
+mnPolygonStrokePrimitive2D++;
+
 mpOutputDevice-DrawPolyPolygon(aLocalPolyPolygon);

[Libreoffice-commits] .: 2 commits - nlpsolver/makefile.mk sdext/source

2011-10-20 Thread Andras Timar

 nlpsolver/makefile.mk |2 +-
 sdext/source/presenter/description.txt|2 ++
 sdext/source/presenter/description.xml|2 +-
 sdext/source/presenter/help/component.txt |2 --
 sdext/source/presenter/makefile.mk|   18 +++---
 5 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit ffb91342fc667d0f1d4ef43384bfcfc176cab774
Author: Andras Timar ati...@suse.com
Date:   Thu Oct 20 11:09:24 2011 +0200

fix localization of NLPSolver

diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index a7d0996..ddbe7aa 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
 
 ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) 
-Doffice.program.dir=$(SOLARBINDIR)
 
-CONFIGURE_ACTION=(cd ../../../../locale  $(GNUTAR) -cf - .) | (cd src/  
$(GNUTAR) xf -)
+CONFIGURE_ACTION=(cd ../../../../locale  $(GNUTAR) -cf - .) | (cd 
src/locale/  rm *de_DE*  $(GNUTAR) xf -)
 
 .IF $(JAVACISGCJ)==yes
 JAVA_HOME=
commit 89f7e17692d019a68d251d39bcc592a4ee8ba0dc
Author: Andras Timar ati...@suse.com
Date:   Sat Oct 8 21:20:31 2011 +0200

localize description.xml of presenter-screen extension

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

[Libreoffice-commits] .: README.cross

2011-10-20 Thread Fridrich Strba

 README.cross |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 06fa2d5a4a9b68a173a09df6000756dce47f7b3d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Oct 20 13:27:08 2011 +0200

Make the README.cross a bit more copypaste proof

diff --git a/README.cross b/README.cross
index e92e82a..6aec90b 100644
--- a/README.cross
+++ b/README.cross
@@ -88,20 +88,24 @@ Build Service, running on openSUSE:
 
 http://download.opensuse.org/repositories/windows:/mingw:/win32/
 
-For example, you can install it on SLE 11 SP1 like this:
+For example, you can install it like this:
+
+zypper ar 
http://download.opensuse.org/repositories/windows:/mingw:/win32/your_os/windows:mingw:win32.repo
+
+where your_os is one of SLE_11, SLE_11_SP1, openSUSE_11.3, openSUSE_11.4 or
+openSUSE_Factory.
 
-zypper ar 
http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/windows:mingw:win32.repo
 zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \
 mingw32-libexpat-devel mingw32-libexpat mingw32-boost-devel \
 mingw32-libhyphen-devel mingw32-libhyphen mingw32-hyphen-en \
 mingw32-liblpsolve mingw32-liblpsolve-devel \
 mingw32-libxml2-devel mingw32-libxslt-devel mingw32-libicu \
 mingw32-libicu-devel mingw32-libgraphite2 mingw32-libgraphite2-devel \
-mingw32-cairo mingw32-cairo-devel mingw32-librsvg mingw32-librsvg-devel \
+mingw32-libcairo2 mingw32-cairo-devel mingw32-librsvg 
mingw32-librsvg-devel \
 mingw32-hunspell mingw32-hunspell-devel mingw32-libcurl \
 mingw32-libcurl-devel mingw32-libneon mingw32-libneon-devel \
-mingw32-libopenssl mingw32-libopenssl-devel mingw32-libtextcat \
-mingw32-libtextcat-devel mingw32-libdb mingw32-libdb-devel \
+mingw32-libopenssl mingw32-libopenssl-devel mingw32-libexttextcat \
+mingw32-libexttextcat-devel mingw32-libdb mingw32-libdb-devel \
 mingw32-cross-pkg-config mingw32-pkg-config mingw32-libcppunit \
 mingw32-libcppunit-devel mingw32-libredland mingw32-libredland-devel \
 mingw32-libmythes mingw32-libmythes-devel
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-20 Thread Caolán McNamara

 svtools/inc/svtools/sampletext.hxx |2 
 svtools/source/misc/sampletext.cxx |  137 -
 2 files changed, 137 insertions(+), 2 deletions(-)

New commits:
commit ada314807900a6b9205bacc1b149ab58720ffa7b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Oct 20 12:53:31 2011 +0100

add makeRepresentativeTextForLanguage to generate sample text

add initial code to generate language specific sample preview text samples 
for
use for font previewing in format-character

diff --git a/svtools/inc/svtools/sampletext.hxx 
b/svtools/inc/svtools/sampletext.hxx
index 1100c8a..09ba499 100644
--- a/svtools/inc/svtools/sampletext.hxx
+++ b/svtools/inc/svtools/sampletext.hxx
@@ -31,6 +31,7 @@
 #include svtools/svtdllapi.h
 #include rtl/ustring.hxx
 #include unicode/uscript.h
+#include i18npool/lang.h
 #include vcl/fontcapabilities.hxx
 
 class OutputDevice;
@@ -44,6 +45,7 @@ SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice 
rDevice);
 SVT_DLLPUBLIC rtl::OUString 
makeRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice);
 SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForSelectedFont(OutputDevice 
rDevice);
 
+SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForLanguage(LanguageType 
eLang);
 SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForScript(UScriptCode 
eScript);
 SVT_DLLPUBLIC rtl::OUString makeMinimalTextForScript(UScriptCode eScript);
 
diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 6cf1604..45a6ba9 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -117,6 +117,16 @@ rtl::OUString 
makeRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice)
 return bHasSampleTextGlyphs ? sSampleText : rtl::OUString();
 }
 
+//These ones are typically for use in the font dropdown box beside the
+//fontname, so say things roughly like Script/Alphabet/Name-Of-Major-Language
+//
+//Here we don't always know the language of course, only the script that can be
+//written with the font. Often that's one single language written in that
+//script, or a handful of related languages where the name of the script is the
+//same between languages, or the name in the major language is known by most
+//readers of the minor languages, e.g. Yiddish is written with the HEBREW
+//script as well, the vast majority of Yiddish readers will be able to read
+//Hebrew as well.
 rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
 {
 rtl::OUString sSampleText;
@@ -427,8 +437,131 @@ rtl::OUString makeMinimalTextForScript(UScriptCode 
eScript)
 return sSampleText;
 }
 
-#define TRADITIONAL_CHINESE 0x0100
-#define SIMPLIFIED_CHINESE  0x0200
+//These ones are typically for use in the font preview window in format
+//character
+//
+//There we generally know the language. Though its possible for the language to
+//be none.
+//
+//Currently we fall back to makeRepresentativeTextForScript as I don't have
+//suitable strings
+rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang)
+{
+switch( eLang )
+{
+case LANGUAGE_CHINESE:
+return makeRepresentativeTextForScript(USCRIPT_HAN);
+
+case LANGUAGE_CHINESE_TRADITIONAL:
+case LANGUAGE_CHINESE_HONGKONG:
+case LANGUAGE_CHINESE_MACAU:
+return makeRepresentativeTextForScript(USCRIPT_TRADITIONAL_HAN);
+
+case LANGUAGE_CHINESE_SIMPLIFIED:
+case LANGUAGE_CHINESE_SINGAPORE:
+return makeRepresentativeTextForScript(USCRIPT_SIMPLIFIED_HAN);
+}
+
+rtl::OUString sRet;
+switch( eLang  LANGUAGE_MASK_PRIMARY )
+{
+case LANGUAGE_GREEK  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_GREEK);
+break;
+case LANGUAGE_HEBREW  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_YIDDISH  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_HEBREW);
+break;
+case LANGUAGE_ARABIC_SAUDI_ARABIA  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_ARABIC);
+break;
+case LANGUAGE_HINDI  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_DEVANAGARI);
+break;
+case LANGUAGE_ASSAMESE  LANGUAGE_MASK_PRIMARY:
+{
+const sal_Unicode aAs[] = {
+0x0985, 0x09B8, 0x09AE, 0x09C0, 0x09AF, 0x09BC, 0x09BE,
+0x0020, 0x0986, 0x0996, 0x09F0
+};
+sRet = rtl::OUString(aAs, SAL_N_ELEMENTS(aAs));
+break;
+}
+case LANGUAGE_BENGALI  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_BENGALI);
+break;
+case LANGUAGE_PUNJABI  LANGUAGE_MASK_PRIMARY:
+sRet = makeRepresentativeTextForScript(USCRIPT_GURMUKHI);
+break;
+case LANGUAGE_GUJARATI

[Libreoffice-commits] .: sdext/source

2011-10-20 Thread Andras Timar

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

New commits:
commit bce48fb94b1ff2f87fac7185ff5a9904bcf83484
Author: Andras Timar ati...@suse.com
Date:   Thu Oct 20 15:07:50 2011 +0200

Revert localize description.xml of presenter-screen extension

This reverts commit 89f7e17692d019a68d251d39bcc592a4ee8ba0dc.

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

[Libreoffice-commits] .: bug/bug

2011-10-20 Thread Loic Dachary

 bug/bug/bug.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e20dcb0f54d8b0634943051a644baec358e26ed0
Author: Loic Dachary l...@dachary.org
Date:   Thu Oct 20 16:40:06 2011 +0200

Lookup in the HTML output using case insensitive match because IE8 converts 
element names to upper case where firefox converts them to lowercase.

diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index dad6af5..545b825 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -79,8 +79,8 @@
 
 url: '',
 
-state_signin_error_regexps: ['class=throw_error([^]*)'],
-state_signin_success_regexp: 'Lognbsp;out/a([^]*)',
+state_signin_error_regexps: [/CLASS=THROW_ERROR([^]*)/i],
+state_signin_success_regexp: /LOGNBSP;OUT/A([^]*)/i,
 
 state_signin: function() {
 var element = $('.signin');
@@ -207,8 +207,8 @@
 }
 },
 
-state_submit_error_regexps: ['class=throw_error([^]*)', 'font 
size=\\+2([^]*)'],
-state_submit_success_regexp: 'titleBug ([0-9]+)',
+state_submit_error_regexps: [/CLASS=THROW_ERROR([^]*)/i, /FONT 
SIZE=\\+2([^]*)/i],
+state_submit_success_regexp: /TITLEBug ([0-9]+)/i,
 state_submit_element: 'html',
 
 state_submit: function() {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - ooo.lst.in

2011-10-20 Thread Michael Meeks

 ooo.lst.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 522f633cb6a986c7ec01eb0b6bc6e84d70b5413a
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Oct 20 14:25:34 2011 +0100

Upgrade graphite to 1.0.3 fix surrogate support

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/ooo.lst.in b/ooo.lst.in
index 3f87bee..afdd4b0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -79,7 +79,8 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
+http://dev-www.libreoffice.org/src
+3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 http://download.go-oo.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - graphite/graphite2.patch graphite/graphite_make.patch graphite/makefile.mk

2011-10-20 Thread Michael Meeks

 graphite/graphite2.patch |4 ++--
 graphite/graphite_make.patch |4 ++--
 graphite/makefile.mk |7 +++
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 2cd89a55941292b3416070b9a5b90274deb59370
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Oct 20 14:25:46 2011 +0100

Upgrade graphite to 1.0.3 fix surrogate support

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index fcd486c..067c747 100644
--- a/graphite/graphite2.patch
+++ b/graphite/graphite2.patch
@@ -1,5 +1,5 @@
 misc/graphite2-1.0.2/include/graphite2/Types.h 2011-02-12 
16:54:16.0 +0100
-+++ misc/build/graphite2-1.0.2/include/graphite2/Types.h   2011-03-15 
21:38:06.264788098 +0100
+--- misc/graphite2-1.0.3/include/graphite2/Types.h
 misc/build/graphite2-1.0.3/include/graphite2/Types.h
 @@ -36,7 +36,7 @@
  };
  
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index c137c12..4532163 100644
--- a/graphite/graphite_make.patch
+++ b/graphite/graphite_make.patch
@@ -1,5 +1,5 @@
 misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
-+++ misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
+--- misc/build/graphite2-1.0.3/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
 misc/build/graphite2-1.0.3/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
 @@ -1,1 +1,38 @@
 -dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 522c261..3793d6c 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -45,11 +45,10 @@ all:
 
 # --- Files 
 .IF $(ENABLE_GRAPHITE)==TRUE
-TARFILE_NAME=graphite2-1.0.2
-TARFILE_MD5=3115c721f5cb7c464f01c2dddccfaba6
+TARFILE_NAME=graphite2-1.0.3
+TARFILE_MD5=3bf481ca95109b14435125c0dd1f2217
 PATCH_FILES= graphite2.patch \
-graphite_make.patch \
-graphite2.placementnew.patch
+graphite_make.patch 
 
 ADDITIONAL_FILES= \
 src/makefile.mk
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-20 Thread Michael Meeks

 vcl/source/glyphs/graphite_layout.cxx |   33 +++--
 1 file changed, 19 insertions(+), 14 deletions(-)

New commits:
commit 79801abff2e4764471a7b328f9150fe4feafe61f
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Oct 20 14:25:50 2011 +0100

Upgrade graphite to 1.0.3 fix surrogate support

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 02e9cea..5238609 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -36,9 +36,9 @@
 #define GR_NAMESPACE
 
 // Enable lots of debug info
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL  1
 #include cstdio
-//#define GRLAYOUT_DEBUG 1
+#define GRLAYOUT_DEBUG 1
 #undef NDEBUG
 #endif
 
@@ -329,8 +329,9 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs rArgs, float fSc
 float leftBoundary = gr_slot_origin_X(clusterFirst);
 float rightBoundary = (clusterAfter)?
 gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment);
-if (mnSegCharOffset + nFirstCharInCluster = mnMinCharPos 
-mnSegCharOffset + nFirstCharInCluster  mnEndCharPos)
+size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, 
nFirstCharInCluster));
+if (mnSegCharOffset + bFirstChar = mnMinCharPos 
+mnSegCharOffset + bFirstChar  mnEndCharPos)
 {
 fMinX = minimumfloat(fMinX, leftBoundary);
 fMaxX = maximumfloat(fMaxX, rightBoundary);
@@ -338,21 +339,22 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs rArgs, float fSc
 {
 for (int i = nFirstCharInCluster; i = nLastCharInCluster; 
i++)
 {
-if (mnSegCharOffset + i = mnEndCharPos)
+size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, 
i));
+if (mnSegCharOffset + ibase = mnEndCharPos)
 break;
 // from the point of view of the dx array, the xpos is
 // the origin of the first glyph of the next cluster 
ltr
-mvCharDxs[mnSegCharOffset + i - mnMinCharPos] =
+mvCharDxs[mnSegCharOffset + ibase - mnMinCharPos] =
 static_castint(rightBoundary * fScaling) + 
nDxOffset;
-mvCharBreaks[mnSegCharOffset + i - mnMinCharPos] = 
gr_cinfo_break_weight(gr_seg_cinfo(pSegment, i));
+mvCharBreaks[mnSegCharOffset + ibase - mnMinCharPos] = 
gr_cinfo_break_weight(gr_seg_cinfo(pSegment, i));
 }
 // only set mvChar2BaseGlyph for first character of cluster
-mvChar2BaseGlyph[mnSegCharOffset + nFirstCharInCluster - 
mnMinCharPos] = nBaseGlyphIndex;
+mvChar2BaseGlyph[mnSegCharOffset + bFirstChar - 
mnMinCharPos] = nBaseGlyphIndex;
 }
 append(pSegment, rArgs, baseSlot, rightBoundary, fScaling,
nDxOffset, true, mnSegCharOffset + firstChar);
 }
-if (mnSegCharOffset + nFirstCharInCluster = mnEndCharPos)
+if (mnSegCharOffset + bFirstChar = mnEndCharPos)
 break;
 baseSlot = gr_slot_next_sibling_attachment(baseSlot);
 }
@@ -596,20 +598,23 @@ gr_segment * 
GraphiteLayout::CreateSegment(ImplLayoutArgs rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-
+size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset, rArgs.mpStr + limit, NULL);
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
-rArgs.mpStr + mnSegCharOffset, limit - 
mnSegCharOffset, bRtl);
+rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
 else
 pSegment = gr_make_seg(mpFont, mpFace, 0, NULL, gr_utf16,
-rArgs.mpStr + mnSegCharOffset, limit - 
mnSegCharOffset, bRtl);
+rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
 
 //pSegment = new gr::RangeSegment((gr::Font *)mrFont, mpTextSrc, 
maLayout, mnMinCharPos, limit);
 if (pSegment != NULL)
 {
 #ifdef GRLAYOUT_DEBUG
-fprintf(grLog(),Gr::LayoutText %d-%d, context %d,len%d rtl%d 
scaling %f\n, rArgs.mnMinCharPos,
-   rArgs.mnEndCharPos, limit, rArgs.mnLength, bRtl, mfScaling);
+fprintf(grLog(),Gr::LayoutText %d-%d, context 
%d,len%d,numchars%d, rtl%d scaling %f:, rArgs.mnMinCharPos,
+   rArgs.mnEndCharPos, limit, rArgs.mnLength, numchars, bRtl, 
mfScaling);
+for (int i = mnSegCharOffset; i  limit; ++i)
+

[Libreoffice-commits] .: vcl/unx

2011-10-20 Thread Lubos Lunak

 vcl/unx/kde4/main.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 6163c62a52794725188faf82ee12852f4b2cd023
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Oct 20 16:41:50 2011 +0200

let Qt call XInitThreads(), so that it knows it's been called (fdo#40298)

Otherwise QPixmap complains when used outside of the main Qt thread
and resets itself to null pixmap, eventually leading to crashes.

diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 9e0a361..482a212 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -56,7 +56,18 @@ extern C {
established, so protect X against itself
 */
 if( ! ( pNoXInitThreads  *pNoXInitThreads ) )
+{
+#if QT_VERSION = 0x040800
+// let Qt call XInitThreads(), so that also Qt knows it's been used
+// (otherwise QPixmap may warn about threads not being initialized)
+QApplication::setAttribute( Qt::AA_X11InitThreads );
+#else
 XInitThreads();
+// just in case somebody builds with old version and then upgrades 
Qt,
+// otherwise this is a no-op
+QApplication::setAttribute( static_cast ApplicationAttribute ( 
10 ));
+#endif
+}
 
 #if QT_VERSION  0x05
 // Qt 4.x support needs = 4.1.0
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-20 Thread Cédric Bosdonnat

 sw/inc/numrule.hxx  |1 -
 sw/source/core/doc/number.cxx   |6 --
 sw/source/ui/config/fontcfg.cxx |   28 
 sw/source/ui/inc/fontcfg.hxx|5 -
 unusedcode.easy |2 --
 5 files changed, 42 deletions(-)

New commits:
commit 21352f88caba9dee73d5a87c8e3724d17ac6b428
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Oct 20 16:47:44 2011 +0200

Sw styles cleanup: removed now unused methods

diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 4401df3..0f7a3b2 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -217,7 +217,6 @@ public:
 static char* GetOutlineRuleName() { return pDefOutlineName; }
 
 static sal_uInt16 GetNumIndent( sal_uInt8 nLvl );
-static sal_uInt16 GetBullIndent( sal_uInt8 nLvl );
 
 SwNumRuleType GetRuleType() const   { return eRuleType; }
 void SetRuleType( SwNumRuleType eNew )  { eRuleType = eNew;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 112ffd5..220aa19 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -175,12 +175,6 @@ sal_uInt16 SwNumRule::GetNumIndent( sal_uInt8 nLvl )
 return aDefNumIndents[ nLvl ];
 }
 
-sal_uInt16 SwNumRule::GetBullIndent( sal_uInt8 nLvl )
-{
-OSL_ENSURE( MAXLEVEL  nLvl, NumLevel is out of range );
-return aDefNumIndents[ nLvl ];
-}
-
 static void lcl_SetRuleChgd( SwTxtNode rNd, sal_uInt8 nLevel )
 {
 if( rNd.GetActualListLevel() == nLevel )
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index efc3c67..0f4d4c8 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -292,34 +292,6 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16 
nFontType, LanguageTyp
 return nRet;
 }
 
-void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
-{
-OSL_ENSURE( nFontType  DEF_FONT_COUNT, invalid index in 
SwStdFontConfig::ChangInt());
-if( nFontType  DEF_FONT_COUNT  nDefaultFontHeight[nFontType] != nHeight)
-{
-SvtLinguOptions aLinguOpt;
-SvtLinguConfig().GetOptions( aLinguOpt );
-
-sal_Int16 eWestern = 
MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, 
::com::sun::star::i18n::ScriptType::LATIN),
-  eCJK = 
MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, 
::com::sun::star::i18n::ScriptType::ASIAN),
-  eCTL = 
MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, 
::com::sun::star::i18n::ScriptType::COMPLEX);
-
-// #i92090# default height value sets back to -1
-const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, 
lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
-const bool bIsDefaultHeight = nHeight == nDefaultHeight;
-if( bIsDefaultHeight  nDefaultFontHeight[nFontType]  0 )
-{
-SetModified();
-nDefaultFontHeight[nFontType] = -1;
-}
-else if( !bIsDefaultHeight  nHeight != nDefaultFontHeight[nFontType] 
)
-{
-SetModified();
-nDefaultFontHeight[nFontType] = nHeight;
-}
-}
-}
-
 sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 
nScriptType, LanguageType eLang )
 {
 OSL_ENSURE(nFont + FONT_PER_GROUP * nScriptType  DEF_FONT_COUNT, wrong 
index in SwStdFontConfig::GetFontHeight());
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index 5acd526..3570130 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -79,8 +79,6 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
 }
 }
 
-void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight );
-
 public:
 SwStdFontConfig();
 ~SwStdFontConfig();
@@ -109,9 +107,6 @@ public:
 void SetFontIndex  (const String rSet, sal_uInt8 nFontGroup)
 {ChangeString(FONT_INDEX + FONT_PER_GROUP * 
nFontGroup, rSet);}
 
-void SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 
nScriptType )
-{ChangeInt(nFont + FONT_PER_GROUP * nScriptType, 
nHeight);}
-
 sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, 
LanguageType eLang );
 
 static StringGetDefaultFor(sal_uInt16 nFontType, LanguageType eLang);
diff --git a/unusedcode.easy b/unusedcode.easy
index f7f28f0..60c838c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1175,7 +1175,6 @@ SwLRects::_ForEach(unsigned short, unsigned short, 
unsigned char (*)(SwLineRect
 SwLoadOptPage::LinkStubCaptionHdl(void*, void*)
 SwMailMergeChildWindow::GetChildWindowId()
 SwModify::GetClientCount() const
-SwNumRule::GetBullIndent(unsigned char)
 SwOutlineNodes::Insert(SwNode* const, unsigned short)
 SwOutlineNodes::Insert(SwNode* const*, unsigned short)
 SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short,

[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/headless vcl/inc vcl/unx

2011-10-20 Thread Michael Meeks

 vcl/headless/svpinst.cxx|   14 ++
 vcl/inc/generic/gendata.hxx |6 +++---
 vcl/inc/unx/gtk/gtkdata.hxx |2 +-
 vcl/inc/unx/kde/kdedata.hxx |2 +-
 vcl/inc/unx/saldata.hxx |2 +-
 vcl/unx/generic/app/saldata.cxx |5 ++---
 vcl/unx/generic/app/salinst.cxx |7 ---
 vcl/unx/gtk/app/gtkdata.cxx |6 +++---
 vcl/unx/gtk/app/gtkinst.cxx |4 +---
 vcl/unx/kde/kdedata.cxx |5 ++---
 vcl/unx/kde4/KDEData.hxx|3 ++-
 vcl/unx/kde4/main.cxx   |5 ++---
 12 files changed, 32 insertions(+), 29 deletions(-)

New commits:
commit 62cf45d9762f87164c9d79ad7223352faa456632
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 20 17:22:19 2011 +0100

generic: fix misc. initialization problems  simplify a little

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index b3e8683..9c0eb6e 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -43,20 +43,26 @@
 
 #include salframe.hxx
 #include svdata.hxx
-#include saldatabasic.hxx
+#include generic/gendata.hxx
 #include vcl/solarmutex.hxx
 
 // FIXME: split off into a separate, standalone module to aid linking
 #ifndef GTK3_INCLUDED
+class SvpSalData : public SalGenericData
+{
+public:
+SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, 
pInstance ) { }
+virtual void ErrorTrapPush() {}
+virtual bool ErrorTrapPop( bool ) { return false; }
+};
+
 // plugin factory function
 extern C
 {
 SAL_DLLPUBLIC_EXPORT SalInstance* create_SalInstance()
 {
 SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() );
-SalData* pSalData = new SalData();
-pSalData-m_pInstance = pInstance;
-SetSalData( pSalData );
+new SvpSalData( pInstance );
 return pInstance;
 }
 }
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 10b0a09..c52e891 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -39,7 +39,7 @@ class SalDisplay;
 class GtkSalDisplay;
 enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
   SAL_DATA_KDE3, SAL_DATA_KDE4,
-  SAL_DATA_UNX };
+  SAL_DATA_UNX, SAL_DATA_SVP };
 
 class VCL_DLLPUBLIC SalGenericData : public SalData
 {
@@ -51,7 +51,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
 // for transient storage of unicode strings eg. 'u123' by input methods
 rtl::OUString  m_aUnicodeEntry;
  public:
-SalGenericData( SalGenericDataType t ) : SalData(), m_eType( t ), 
m_pDisplay( NULL ) {}
+SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : 
SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; 
SetSalData( this ); }
 virtual ~SalGenericData() {}
 virtual void Dispose() {}
 
@@ -80,7 +80,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
 // Not the prettiest - but helpful for migrating old code ...
 inline SalDisplay *GetSalDisplay() const
 {
-OSL_ASSERT( m_eType == SAL_DATA_UNX || m_eType == SAL_DATA_GTK );
+OSL_ASSERT( m_eType != SAL_DATA_GTK3 );
 return (SalDisplay *)GetDisplay();
 }
 inline GtkSalDisplay *GetGtkDisplay() const
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 0c9af2a..458dfdd 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -100,7 +100,7 @@ class GtkData : public SalGenericData
 oslCondition m_aDispatchCondition;
 
 public:
-GtkData();
+GtkData( SalInstance *pInstance );
 virtual ~GtkData();
 
 virtual void Init();
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index f948af0..6112b47 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -36,7 +36,7 @@
 class KDEData : public X11SalData
 {
 public:
-KDEData() : X11SalData( SAL_DATA_KDE3 ) {}
+KDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_KDE3, pInstance ) 
{}
 virtual ~KDEData();
 
 virtual void Init();
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 2d5dca5..9c49014 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -76,7 +76,7 @@ protected:
 pthread_t hMainThread_;
 
 public:
-X11SalData( SalGenericDataType t );
+ X11SalData( SalGenericDataType t, SalInstance *pInstance );
 virtual ~X11SalData();
 
 virtual voidInit();
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 4b235a4..0459ee4 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -236,11 +236,10 @@ static const char* XRequest[] = {
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include pthread.h
 
-X11SalData::X11SalData( SalGenericDataType t )
-: SalGenericData( t )
+X11SalData::X11SalData( SalGenericDataType t, SalInstance

[Libreoffice-commits] .: vcl/unx

2011-10-20 Thread Lubos Lunak

 vcl/unx/kde4/KDESalGraphics.cxx |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 936d19e606cbf29d41bff42db559a01f5deb240c
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Oct 20 19:05:13 2011 +0200

fix horizontal scrollbars with KDE oxygen style (bnc#722918)

Apparently there are two style flags for detecting the widget
is horizontal.

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 5dbe491..60cd4ed 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -493,10 +493,9 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 if (sbVal-mnVisibleSize  sbVal-mnMax)
 option.state = QStyle::State_MouseOver;
 
-//horizontal or vertical
-if (part == PART_DRAW_BACKGROUND_VERT)
-option.orientation = Qt::Vertical;
-else
+bool horizontal = ( part == PART_DRAW_BACKGROUND_HORZ ); 
//horizontal or vertical
+option.orientation = horizontal ? Qt::Horizontal : Qt::Vertical;
+if( horizontal )
 option.state |= QStyle::State_Horizontal;
 
 //setup parameters from the OO values
@@ -592,7 +591,10 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType 
type, ControlPart part,
 option.maximum = slVal-mnMax;
 option.minimum = slVal-mnMin;
 option.sliderPosition = option.sliderValue = slVal-mnCur;
-option.orientation = (part == PART_TRACK_HORZ_AREA) ? Qt::Horizontal : 
Qt::Vertical;
+bool horizontal = ( part == PART_TRACK_HORZ_AREA ); //horizontal or 
vertical
+option.orientation = horizontal ? Qt::Horizontal : Qt::Vertical;
+if( horizontal )
+option.state |= QStyle::State_Horizontal;
 
 draw( QStyle::CC_Slider, option, m_image, 
vclStateValue2StateFlag(nControlState, value) );
 }
@@ -901,7 +903,10 @@ sal_Bool KDESalGraphics::getNativeControlRegion( 
ControlType type, ControlPart p
 if( part == PART_TRACK_VERT_AREA || part == PART_TRACK_HORZ_AREA )
 {
 QStyleOptionSlider option;
-option.orientation = ( part == PART_TRACK_HORZ_AREA ) ? 
Qt::Horizontal : Qt::Vertical;
+bool horizontal = ( part == PART_TRACK_HORZ_AREA ); 
//horizontal or vertical
+option.orientation = horizontal ? Qt::Horizontal : 
Qt::Vertical;
+if( horizontal )
+option.state |= QStyle::State_Horizontal;
 // getNativeControlRegion usually gets ImplControlValue as 
'val' (i.e. not the proper
 // subclass), so use random sensible values (doesn't matter 
anyway, as the wanted
 // geometry here depends only on button sizes)
@@ -971,6 +976,8 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType 
nType, ControlPart nP
 rect.moveTo( 0, 0 );
 QStyleOptionSlider options;
 options.orientation = bHorizontal ? Qt::Horizontal : Qt::Vertical;
+if( bHorizontal )
+options.state |= QStyle::State_Horizontal;
 options.rect = rect;
 // some random sensible values, since we call this code only for 
scrollbar buttons,
 // the slider position does not exactly matter
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/qa sc/source

2011-10-20 Thread Markus Mohrhard

 sc/qa/unit/ucalc.cxx  |   57 +-
 sc/source/core/data/cell2.cxx |2 -
 2 files changed, 52 insertions(+), 7 deletions(-)

New commits:
commit 16cf673187679b3f45f2623bc6e3a52bf7dbba45
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Oct 20 19:16:06 2011 +0200

improve unit test for UpdateReference

check InsertTabs/InsertTab/DeleteTabs too

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 19741ed..232a62e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -237,7 +237,7 @@ public:
 void testAutofilter();
 void testCopyPaste();
 void testMergedCells();
-void testSheetDelete();
+void testUpdateReference();
 
 /**
  * Make sure the sheet streams are invalidated properly.
@@ -282,7 +282,7 @@ public:
 CPPUNIT_TEST(testAutofilter);
 CPPUNIT_TEST(testCopyPaste);
 CPPUNIT_TEST(testMergedCells);
-CPPUNIT_TEST(testSheetDelete);
+CPPUNIT_TEST(testUpdateReference);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2312,32 +2312,77 @@ void Test::testMergedCells()
 m_pDoc-DeleteTab(0);
 }
 
-void Test::testSheetDelete()
+void Test::testUpdateReference()
 {
 //test that formulas are correctly updated during sheet delete
 //TODO: add test cases for InsertTabs/InsertTab and DeleteTabs
 //TODO: add tests for references to other sheets, relative references, 
updating of named ranges, ...
 //TODO: maybe rename then to testUpdateReference
-m_pDoc-InsertTab(0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Sheet1)));
-m_pDoc-InsertTab(1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Sheet2)));
-m_pDoc-InsertTab(2, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Sheet3)));
+rtl::OUString aSheet1(RTL_CONSTASCII_USTRINGPARAM(Sheet1));
+rtl::OUString aSheet2(RTL_CONSTASCII_USTRINGPARAM(Sheet2));
+rtl::OUString aSheet3(RTL_CONSTASCII_USTRINGPARAM(Sheet3));
+rtl::OUString aSheet4(RTL_CONSTASCII_USTRINGPARAM(Sheet4));
+m_pDoc-InsertTab(0, aSheet1);
+m_pDoc-InsertTab(1, aSheet2);
+m_pDoc-InsertTab(2, aSheet3);
+m_pDoc-InsertTab(3, aSheet4);
 
 m_pDoc-SetValue(0,0,2, 1);
 m_pDoc-SetValue(1,0,2, 2);
+m_pDoc-SetValue(1,1,3, 4);
 m_pDoc-SetString(2,0,2, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=A1+B1)));
+m_pDoc-SetString(2,1,2, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(=Sheet4.B2+A1)));
 
 double aValue;
 m_pDoc-GetValue(2,0,2, aValue);
 CPPUNIT_ASSERT_MESSAGE(formula does not return correct result, aValue == 
3);
+m_pDoc-GetValue(2,1,2, aValue);
+CPPUNIT_ASSERT_MESSAGE(formula does not return correct result, aValue == 
5);
 
 //test deleting both sheets: one is not directly before the sheet, the 
other one is
 m_pDoc-DeleteTab(0);
 m_pDoc-GetValue(2,0,1, aValue);
 CPPUNIT_ASSERT_MESSAGE(after deleting first sheet formula does not return 
correct result, aValue == 3);
+m_pDoc-GetValue(2,1,1, aValue);
+CPPUNIT_ASSERT_MESSAGE(after deleting first sheet formula does not return 
correct result, aValue == 5);
 
 m_pDoc-DeleteTab(0);
 m_pDoc-GetValue(2,0,0, aValue);
 CPPUNIT_ASSERT_MESSAGE(after deleting second sheet formula does not 
return correct result, aValue == 3);
+m_pDoc-GetValue(2,1,0, aValue);
+CPPUNIT_ASSERT_MESSAGE(after deleting second sheet formula does not 
return correct result, aValue == 5);
+
+//test adding two sheets
+m_pDoc-InsertTab(0, aSheet2);
+m_pDoc-GetValue(2,0,1, aValue);
+CPPUNIT_ASSERT_MESSAGE(after inserting first sheet formula does not 
return correct result, aValue == 3);
+m_pDoc-GetValue(2,1,1, aValue);
+CPPUNIT_ASSERT_MESSAGE(after inserting first sheet formula does not 
return correct result, aValue == 5);
+
+m_pDoc-InsertTab(0, aSheet1);
+m_pDoc-GetValue(2,0,2, aValue);
+CPPUNIT_ASSERT_MESSAGE(after inserting second sheet formula does not 
return correct result, aValue == 3);
+m_pDoc-GetValue(2,1,2, aValue);
+CPPUNIT_ASSERT_MESSAGE(after inserting second sheet formula does not 
return correct result, aValue == 5);
+
+m_pDoc-DeleteTabs(0, 2);
+m_pDoc-GetValue(2, 0, 0, aValue);
+CPPUNIT_ASSERT_MESSAGE(after deleting sheets formula does not return 
correct result, aValue == 3);
+m_pDoc-GetValue(2, 1, 0, aValue);
+CPPUNIT_ASSERT_MESSAGE(after deleting sheets formula does not return 
correct result, aValue == 5);
+
+std::vectorrtl::OUString aSheets;
+aSheets.push_back(aSheet1);
+aSheets.push_back(aSheet2);
+m_pDoc-InsertTabs(0, aSheets, false, true);
+m_pDoc-GetValue(2, 0, 2, aValue);
+rtl::OUString aFormula;
+m_pDoc-GetFormula(2,0,2, aFormula);
+std::cout  formel:   rtl::OUStringToOString(aFormula, 
RTL_TEXTENCODING_UTF8).getStr()  std::endl;
+std::cout  std::endl  aValue  std::endl;
+CPPUNIT_ASSERT_MESSAGE(after inserting sheets formula does not return 
correct result, aValue == 3);
+m_pDoc-GetValue(2, 1, 2, aValue);
+

[Libreoffice-commits] .: vcl/unx

2011-10-20 Thread Lubos Lunak

 vcl/unx/kde4/main.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6347e0971d718943241627f528fa4df3950ad44
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Oct 20 19:56:44 2011 +0200

fix last commit

diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 482a212..12e4e14 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -65,7 +65,7 @@ extern C {
 XInitThreads();
 // just in case somebody builds with old version and then upgrades 
Qt,
 // otherwise this is a no-op
-QApplication::setAttribute( static_cast ApplicationAttribute ( 
10 ));
+QApplication::setAttribute( static_cast Qt::ApplicationAttribute 
( 10 ));
 #endif
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/unx

2011-10-20 Thread Michael Meeks

 vcl/unx/generic/app/saldata.cxx   |1 +
 vcl/unx/generic/app/wmadaptor.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 30c55ed21d66fc68977881423fc3b52fdd82693b
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 20 19:37:01 2011 +0100

generic: fix error trap push/pop/reset semantics

diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 0459ee4..1164a4e 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -294,6 +294,7 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError )
 bool err = false;
 if( !bIgnoreError )
 err = HasXErrorOccurred();
+ResetXErrorOccurred();
 PopXErrorLevel();
 return err;
 }
diff --git a/vcl/unx/generic/app/wmadaptor.cxx 
b/vcl/unx/generic/app/wmadaptor.cxx
index ed97ddb..d530932 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -800,7 +800,7 @@ bool WMAdaptor::getNetWmName()
  nFormat == 32
  nItems != 0 )
 {
-if ( GetGenericData()-ErrorTrapPop( false ) )
+if ( ! GetGenericData()-ErrorTrapPop( false ) )
 {
 GetGenericData()-ErrorTrapPush();
 aCheckWindow =  *(XLIB_Window*)pProperty;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-20 Thread Ivan Timofeev

 tools/inc/tools/multisel.hxx   |3 
 tools/source/memtools/multisel.cxx |  158 -
 2 files changed, 161 deletions(-)

New commits:
commit d72701bba66817fbd0ddcb8dea969aea49f8426a
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Oct 20 23:11:17 2011 +0400

bye-bye old range parser

diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 6d3c3de..a979c23 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -71,9 +71,6 @@ public:
 MultiSelection();
 MultiSelection( const MultiSelection rOrig );
 MultiSelection( const Range rRange );
-MultiSelection( const UniString rString,
-sal_Unicode cRange = '-',
-sal_Unicode cSep = ';' );
 ~MultiSelection();
 
 MultiSelection operator= ( const MultiSelection rOrig );
diff --git a/tools/source/memtools/multisel.cxx 
b/tools/source/memtools/multisel.cxx
index 1a21f0a..4d6d577 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -137,164 +137,6 @@ MultiSelection::MultiSelection():
 
 // ---
 
-MultiSelection::MultiSelection( const UniString rString, sal_Unicode cRange, 
sal_Unicode cSep ):
-aTotRange(0,RANGE_MAX),
-nCurSubSel(0),
-nSelCount(0),
-bCurValid(sal_False),
-bSelectNew(sal_False)
-{
-// Dies ist nur ein Schnellschuss und sollte bald optimiert,
-// an die verschiedenen Systeme (UNIX etc.)
-// und die gewuenschte Eingabe-Syntax angepasst werden.
-
-UniString   aStr( rString );
-sal_Unicode*pStr   = aStr.GetBufferAccess();
-sal_Unicode*pOld = pStr;
-sal_BoolbReady = sal_False;
-sal_BoolbUntil = sal_False;
-xub_StrLen  nCut   = 0;
-
-// Hier normieren wir den String, sodass nur Ziffern,
-// Semikola als Trenn- und Minus als VonBis-Zeichen
-// uebrigbleiben, z.B. 99-117;55;34;-17;37-43
-while ( *pOld )
-{
-switch( *pOld )
-{
-case '0':
-case '1':
-case '2':
-case '3':
-case '4':
-case '5':
-case '6':
-case '7':
-case '8':
-case '9':
-DBG_ASSERT( *pOld != cRange, digit for range char not 
allowed );
-DBG_ASSERT( *pOld != cSep, digit for separator not allowed );
-if( bReady )
-{
-*pStr++ = ';';
-nCut++;
-bReady = sal_False;
-}
-*pStr++ = *pOld;
-nCut++;
-bUntil = sal_False;
-break;
-
-case '-':
-case ':':
-case '/':
-if ( *pOld != cSep )
-{
-if ( !bUntil )
-{
-*pStr++ = '-';
-nCut++;
-bUntil = sal_True;
-}
-bReady = sal_False;
-}
-else
-bReady = sal_True;
-break;
-
-case ' ':
-DBG_ASSERT( *pOld != cRange, SPACE for range char not 
allowed );
-DBG_ASSERT( *pOld != cSep, SPACE for separator not allowed );
-bReady = !bUntil;
-break;
-
-default:
-if ( *pOld == cRange )
-{
-if ( !bUntil )
-{
-*pStr++ = '-';
-nCut++;
-bUntil = sal_True;
-}
-bReady = sal_False;
-}
-else
-bReady = sal_True;
-break;
-}
-
-pOld++;
-}
-aStr.ReleaseBufferAccess( nCut );
-
-// Jetzt wird der normierte String ausgewertet ..
-UniString   aNumStr;
-Range   aRg( 1, RANGE_MAX );
-const sal_Unicode*  pCStr = aStr.GetBuffer();
-longnPage = 1;
-longnNum  = 1;
-bUntil = sal_False;
-while ( *pCStr )
-{
-switch ( *pCStr )
-{
-case '0':
-case '1':
-case '2':
-case '3':
-case '4':
-case '5':
-case '6':
-case '7':
-case '8':
-case '9':
-aNumStr += *pCStr;
-break;
-case ';':
-nNum = aNumStr.ToInt32();
-if ( bUntil )
-{
-if ( !aNumStr.Len() )
-nNum = RANGE_MAX;
-

[Libreoffice-commits] .: 2 commits - sc/qa

2011-10-20 Thread Markus Mohrhard

 sc/qa/unit/filters-test.cxx   |   23 +
 sc/qa/unit/helper/debughelper.hxx |  170 ++
 sc/qa/unit/ucalc.cxx  |  124 ---
 3 files changed, 195 insertions(+), 122 deletions(-)

New commits:
commit d9604fa1b4123da145fc9b52901b42888d25ca3b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Oct 20 20:23:15 2011 +0200

add more debug output to see why windows has problems with sc's filters-test

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 8292c38..71a4339 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -43,7 +43,10 @@
 #include editeng/justifyitem.hxx
 #include basic/sbxdef.hxx
 
+#define CALC_DEBUG_OUTPUT 1
+
 #include helper/csv_handler.hxx
+#include helper/debughelper.hxx
 #include orcus/csv_parser.hpp
 #include fstream
 #include string
@@ -465,6 +468,26 @@ void ScFiltersTest::testFormats()
 CPPUNIT_ASSERT_MESSAGE(Failed to load formats.*, xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 
+SheetPrinter StringPrinter( 8, 3);
+SheetPrinter ValuePrinter( 8, 3);
+for (SCROW nRow = 0; nRow  8; ++nRow)
+{
+for (SCCOL nCol = 0; nCol  3; ++nCol)
+{
+String aString;
+double aVal;
+pDoc-GetValue(nCol, nRow, 0, aVal);
+pDoc-GetString(nCol, nRow, 0, aString);
+ValuePrinter.set(nRow, nCol, rtl::OUString::valueOf(aVal));
+StringPrinter.set(nRow, nCol, aString);
+}
+}
+ValuePrinter.print(Data sheet content: Value);
+ValuePrinter.clear();
+StringPrinter.print(Data sheet content: String);
+StringPrinter.clear();
+
+
 //output this just for debugging, should make it easier to see which 
local the numberformatter really used
 //it helps to understand why some windows build fails in this test
 LanguageType aLang, aCjkLang, aCtlLang;
diff --git a/sc/qa/unit/helper/debughelper.hxx 
b/sc/qa/unit/helper/debughelper.hxx
index ac3e31a..65dc3c2 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -77,7 +77,7 @@ public:
 maMatrix.set_string(row, col, new OUString(aStr));
 }
 
-#if UCALC_DEBUG_OUTPUT
+#if CALC_DEBUG_OUTPUT
 void print(const char* header) const
 {
 if (header)
@@ -138,7 +138,7 @@ public:
  */
 void printArray() const
 {
-#if UCALC_DEBUG_OUTPUT
+#if CALC_DEBUG_OUTPUT
 MatrixType::size_pair_type ns = maMatrix.size();
 for (size_t row = 0; row  ns.first; ++row)
 {
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9abe9f7..a251360 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -71,7 +71,7 @@
 #include iostream
 #include vector
 
-#define UCALC_DEBUG_OUTPUT 0
+#define CALC_DEBUG_OUTPUT 0
 
 #include helper/debughelper.hxx
 
commit cda653d7d9038fdcab72cfcae37d3d20463693d5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Oct 20 20:05:33 2011 +0200

extract helper methods for debuging calc tests

diff --git a/sc/qa/unit/helper/debughelper.hxx 
b/sc/qa/unit/helper/debughelper.hxx
new file mode 100644
index 000..ac3e31a
--- /dev/null
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -0,0 +1,170 @@
+/*
+ * 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 Markus Mohrhard markus.mohrh...@googlemail.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.
+ */
+
+/**
+ * Print nicely formatted sheet content to stdout.  Indispensable when
+ * debugging the unit test code involving testing of sheet contents.
+ */
+
+#include rtl/strbuf.hxx
+#include rtl/ustring.hxx
+#include document.hxx
+
+#ifdef WNT
+#define NOMINMAX
+#include prewin.h
+#include postwin.h
+#undef NOMINMAX
+#endif
+
+#define MDDS_HASH_CONTAINER_BOOST 1
+#include mdds/mixed_type_matrix.hpp
+
+#include iostream
+
+using namespace ::com::sun::star;
+using ::rtl::OUString;

[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - canvas/source vcl/inc vcl/unx

2011-10-20 Thread Michael Meeks

 canvas/source/cairo/cairo_xlib_cairo.cxx |3 +
 vcl/inc/unx/gtk/gtkdata.hxx  |2 
 vcl/inc/unx/gtk/gtkframe.hxx |1 
 vcl/unx/gtk/app/gtkdata.cxx  |   11 ++---
 vcl/unx/gtk/app/gtksys.cxx   |4 -
 vcl/unx/gtk/window/gtkframe.cxx  |   68 +++
 6 files changed, 38 insertions(+), 51 deletions(-)

New commits:
commit 67a9f6ae97d5b80433328c1120b977ae381063b5
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 20 21:49:40 2011 +0100

gtk3: fix cairo canvas crash for non X (or svp) backend

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index a0569ab..8e9120d 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -55,6 +55,9 @@ namespace cairo
 return false;
 
 Display* pDisplay = (Display*)pOutDev-GetSystemGfxData().pDisplay;
+if( !pDisplay )
+return false;
+
 int nDummy;
 return XQueryExtension( pDisplay, RENDER, nDummy, nDummy, nDummy 
);
 }
commit 8173d08f0a3e9f205d2078fe8299d1650a81eea3
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Oct 20 21:12:39 2011 +0100

gtk3: cleanup fullscreen unpleasantness

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 458dfdd..8b87eb2 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -130,6 +130,7 @@ class GtkSalDisplay : public SalDisplay
 GdkDisplay* m_pGdkDisplay;
 GdkCursor  *m_aCursors[ POINTER_COUNT ];
 boolm_bStartupCompleted;
+boolm_bX11Display;
 
 GdkCursor* getFromXBM( const unsigned char *pBitmap, const unsigned char 
*pMask,
int nWidth, int nHeight, int nXHot, int nYHot );
@@ -138,6 +139,7 @@ public:
 virtual ~GtkSalDisplay();
 
 GdkDisplay* GetGdkDisplay() const { return m_pGdkDisplay; }
+boolIsX11Display() const { return m_bX11Display; }
 
 virtual void deregisterFrame( SalFrame* pFrame );
 GdkCursor *getCursor( PointerStyle ePointerStyle );
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4fa86d3..edd904e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -177,7 +177,6 @@ class GtkSalFrame : public SalFrame, 
basebmp::BitmapDeviceDamageTracker
 
 int m_nScreen;
 GtkWidget*  m_pWindow;
-guint   m_nIdleFullScreen;
 int m_nDuringRender;
 GdkWindow*  m_pForeignParent;
 GdkNativeWindow m_aForeignParentWindow;
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 27a2413..ad417f1 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -101,6 +101,12 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
 
 if ( getenv( SAL_IGNOREXERRORS ) )
 GetGenericData()-ErrorTrapPush(); // and leak the trap
+
+#if GTK_CHECK_VERSION(3,0,0)
+m_bX11Display = GDK_IS_X11_DISPLAY( m_pGdkDisplay );
+#else
+m_bX11Display = true;
+#endif
 }
 
 GtkSalDisplay::~GtkSalDisplay()
@@ -214,11 +220,6 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen )
 emitDisplayChanged();
 }
 
-extern C
-{
-typedef gint(* screen_get_primary_monitor)(GdkScreen *screen);
-}
-
 void GtkSalDisplay::initScreen( int nScreen ) const
 {
 #if GTK_CHECK_VERSION(3,0,0)
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 6e09b6a..a80e68a 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -108,7 +108,7 @@ bool GtkSalSystem::IsMultiDisplay()
 }
 
 namespace {
-int _fallback_get_primary_monitor (GdkScreen *pScreen)
+static int _fallback_get_primary_monitor (GdkScreen *pScreen)
 {
 // Use monitor name as primacy heuristic
 int ret = -1;
@@ -123,7 +123,7 @@ int _fallback_get_primary_monitor (GdkScreen *pScreen)
 return 0;
 }
 
-int _get_primary_monitor (GdkScreen *pScreen)
+static int _get_primary_monitor (GdkScreen *pScreen)
 {
 static int (*get_fn) (GdkScreen *) = NULL;
 #if GTK_CHECK_VERSION(3,0,0)
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4a4db88..3ab7840 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -46,6 +46,7 @@
 
 #include tools/prex.h
 #include X11/Xatom.h
+#include gdk/gdkx.h
 #include tools/postx.h
 
 #include dlfcn.h
@@ -444,7 +445,6 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong 
nStyle )
 {
 m_nScreen = getDisplay()-GetDefaultScreenNumber();
 getDisplay()-registerFrame( this );
-m_nIdleFullScreen   = 0;
 m_nDuringRender = 0;
 m_bDefaultPos   = true;
 m_bDefaultSize  = ( (nStyle  SAL_FRAME_STYLE_SIZEABLE)  ! pParent );
@@

[Libreoffice-commits] .: smoketestoo_native/losmoketest.py

2011-10-20 Thread Takeshi Abe

 smoketestoo_native/losmoketest.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc8a310eef5b4cab9b65e2a3a8e41f039f2acc80
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Oct 20 11:31:19 2011 +0900

fixed typo

diff --git a/smoketestoo_native/losmoketest.py 
b/smoketestoo_native/losmoketest.py
index 4875df2..4c86997 100755
--- a/smoketestoo_native/losmoketest.py
+++ b/smoketestoo_native/losmoketest.py
@@ -593,7 +593,7 @@ def main():
 elif o in (-l, --loop):
 loop = True
 else:
-assert False, Unhadled option:  + o
+assert False, Unhandled option:  + o
 
 if interactive == True:
 key = raw_input(The testing will OVERRIDE existed libreoffice, 
continue(y/N)? )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice-commits] .: sc/source

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

[Libreoffice-commits] .: 2 commits - nlpsolver/makefile.mk sdext/source

[Libreoffice-commits] .: README.cross

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

[Libreoffice-commits] .: sdext/source

[Libreoffice-commits] .: bug/bug

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - ooo.lst.in

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - graphite/graphite2.patch graphite/graphite_make.patch graphite/makefile.mk

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

[Libreoffice-commits] .: vcl/unx

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

[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/headless vcl/inc vcl/unx

[Libreoffice-commits] .: vcl/unx

[Libreoffice-commits] .: 2 commits - sc/qa sc/source

[Libreoffice-commits] .: vcl/unx

[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/unx

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

[Libreoffice-commits] .: 2 commits - sc/qa

[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - canvas/source vcl/inc vcl/unx

[Libreoffice-commits] .: smoketestoo_native/losmoketest.py

22 matches

Site Navigation

Mail list logo

Footer information