date:20111128

[Libreoffice-commits] .: nlpsolver/ThirdParty

2011-11-28 Thread Stephan Bergmann

 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45ea23ad39a7cbc5d56f428491d236c7e6c32e0d
Author: Stephan Bergmann 
Date:   Tue Nov 29 08:37:29 2011 +0100

Replaced UTF-8 U+FFFD with ASCII space in source code comment.

The Unicode replacement character got in there probably during a previous
conversion of the source code; not evident to me what it replaced 
originally.

diff --git 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index cb06936..e77c972 100755
--- 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -18,7 +18,7 @@
  * @References:
  * [1] Storn R, Price K. Differential evolution - a simple and efficient
  * heuristic for global optimization over continuous spaces. Journal of
- * Global Optimization, 1997, 11: 341ï¿½C359
+ * Global Optimization, 1997, 11: 341 C359
  * @ The original differential evolution idea
  * [2] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical
  * optimization. Genetic and Evolutionary Computation Conference (GECCO),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-28 Thread Kohei Yoshida

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

New commits:
commit 2d99262c2de5ccaaaee7b4cade3e05228a90eb64
Author: Kohei Yoshida 
Date:   Tue Nov 29 00:51:51 2011 -0500

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

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

[Libreoffice-commits] .: sc/source

2011-11-28 Thread Kohei Yoshida

 sc/source/ui/inc/preview.hxx  |2 --
 sc/source/ui/view/preview.cxx |7 ++-
 sc/source/ui/view/prevwsh.cxx |2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 2f92037b08c8c08bee1cf91b2b1ccdff394445a4
Author: Kohei Yoshida 
Date:   Tue Nov 29 00:27:57 2011 -0500

fdo#32826: Fixed the print preview inconsistency.

Now, the print preview should display the correct set of sheets
based on the print settings as well as what sheets are selected.
Previously, this was very quirky and inaccurate.

diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index f698291..f926e1a 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -65,8 +65,6 @@ private:
 ScPreviewLocationData* pLocationData;   // stores table layout for 
accessibility API
 FmFormView* pDrawView;
 
-SCTAB   nCurTab;
-
 // intern:
 ScDocShell* pDocShell;
 ScPreviewShell* pViewShell;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 272be84..186205c 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -107,7 +107,6 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, 
ScPreviewShell* pView
 nTotalPages( 0 ),
 pLocationData( NULL ),
 pDrawView( NULL ),
-nCurTab ( ScDocShell::GetCurTab() ),
 pDocShell( pDocSh ),
 pViewShell( pViewSh ),
 bInGetState( false ),
@@ -247,9 +246,6 @@ void ScPreview::CalcPages()
 //  but always all sheets are used (there is no selected sheet)
 ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
 
-ScMarkData aMarkData;
-aMarkData.SelectTable( nCurTab, true );
-
 while (nStart > static_cast(nPages.size()))
 nPages.push_back(0);
 while (nStart > static_cast(nFirstAttr.size()))
@@ -260,7 +256,8 @@ void ScPreview::CalcPages()
 nPages.push_back(0);
 if ( i == static_cast(nFirstAttr.size()))
 nFirstAttr.push_back(0);
-if (!aOptions.GetAllSheets() && !aMarkData.GetTableSelect( i )) {
+if (!aOptions.GetAllSheets() && !maSelectedTabs.count(i) > 0)
+{
 nPages[i] = 0;
 nFirstAttr[i] = 0;
 continue;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 89fd968..ef995ba 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -159,8 +159,8 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 ScTabViewShell* pTabViewShell = ((ScTabViewShell*)pOldSh);
 const ScViewData* pData = pTabViewShell->GetViewData();
 pData->WriteUserDataSequence( aSourceData );
-InitStartTable( pData->GetTabNo() );
 pPreview->SetSelectedTabs(pData->GetMarkData());
+InitStartTable( pData->GetTabNo() );
 
 //  also have to store the TabView's DesignMode state
 //  (only if draw view exists)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Kohei Yoshida

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

New commits:
commit 6a4bb3e17c79d1ce8b2528a4b9c22456be911f32
Author: Kohei Yoshida 
Date:   Mon Nov 28 23:44:47 2011 -0500

More meaningless comments removed.

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

Arg to CalcPages() no longer used.

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

sal_Bool cleanup in ScPreview.

diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 9313d75..26ef7b3 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -49,7 +49,6 @@ private:
 Point   aOffset;// positiv

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Thorsten Behrens

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

New commits:
commit 9c31884d929f837695f3ed0a2ead8c5aea900ec7
Author: Thorsten Behrens 
Date:   Tue Nov 29 05:50:51 2011 +0100

Make branding bulk-configurable.

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

[Libreoffice-commits] .: basctl/source

2011-11-28 Thread August Sodora

 basctl/source/dlged/propbrw.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 88459fcc8f768e7a7f5116211635c6f6ba7ccb7b
Author: August Sodora 
Date:   Mon Nov 28 22:20:38 2011 -0500

String->OUString

diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 7f3b684..5ee9c28 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -330,8 +330,8 @@ void PropBrw::implSetNewObjectSequence
 {
 xObjectInspector->inspect( _rObjectSeq );
 
-::rtl::OUString aText = 
::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
-aText += 
::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
+::rtl::OUString aText = 
ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES));
+aText += ResId::toString(IDEResId(RID_STR_BRWTITLE_MULTISELECT));
 SetText( aText );
 }
 }
@@ -360,7 +360,7 @@ void PropBrw::implSetNewObject( const Reference< 
XPropertySet >& _rxObject )
 if (xServiceInfo.is())// single selection
 {
 sal_uInt16 nResId = 0;
-aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
+aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_PROPERTIES));
 
 if ( xServiceInfo->supportsService( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ) )
 {
@@ -458,7 +458,7 @@ void PropBrw::implSetNewObject( const Reference< 
XPropertySet >& _rxObject )
 }
 else if (!_rxObject.is())// no properties
 {
-aName = 
::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES)));
+aName = ResId::toString(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES));
 }
 
 return aName;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-28 Thread August Sodora

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

New commits:
commit a82a87315033e416d267242002b6722051deb8a4
Author: August Sodora 
Date:   Mon Nov 28 22:16:47 2011 -0500

String->OUString

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

[Libreoffice-commits] .: cui/source

2011-11-28 Thread Lior Kaplan

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

New commits:
commit 3a0e84426bfab5787abda96162fe1d06d4a2ec38
Author: Lior Kaplan 
Date:   Tue Nov 29 01:58:28 2011 +0200

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

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

[Libreoffice-commits] .: writerfilter/source

2011-11-28 Thread Miklos Vajna

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

New commits:
commit 61edefc8c862c94750e172c3f7d7b86379a2b862
Author: Miklos Vajna 
Date:   Tue Nov 29 00:54:28 2011 +0100

remove debug printf

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

[Libreoffice-commits] .: 2 commits - writerfilter/source

2011-11-28 Thread Miklos Vajna

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   40 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   10 --
 2 files changed, 41 insertions(+), 9 deletions(-)

New commits:
commit 4f6d80fbb8a83ef98dd3c0d746fa7fe650d71f02
Author: Miklos Vajna 
Date:   Tue Nov 29 00:48:55 2011 +0100

RTF: Avoid importing unicode characters one by one

This imprives speed of importing unicode text further. Results of a
sample of chinese text of 5 pages:

- before: 6.692s
- after: 1.388s

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0e81b4a..1a138c0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -291,7 +291,8 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_nCurrentStyleIndex(0),
 m_bEq(false),
 m_bWasInFrame(false),
-m_bIsInFrame(false)
+m_bIsInFrame(false),
+m_aUnicodeBuffer()
 {
 OSL_ASSERT(xInputStream.is());
 m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, 
sal_True));
@@ -339,6 +340,7 @@ bool RTFDocumentImpl::isSubstream() const
 
 void RTFDocumentImpl::finishSubstream()
 {
+checkUnicode();
 // At the end of a footnote stream, we need to emit a run break when 
importing from Word.
 // We can't do so unconditionally, as Writer already writes a \par at the 
end of the footnote.
 if (m_bNeedCr)
@@ -697,12 +699,20 @@ int RTFDocumentImpl::resolveChars(char ch)
 {
 OStringBuffer aBuf;
 
+bool bUnicodeChecked = false;
 while(!Strm().IsEof() && ch != '{' && ch != '}' && ch != '\\')
 {
 if (ch != 0x0d && ch != 0x0a)
 {
 if (m_aStates.top().nCharsToSkip == 0)
+{
+if (!bUnicodeChecked)
+{
+checkUnicode();
+bUnicodeChecked = true;
+}
 aBuf.append(ch);
+}
 else
 m_aStates.top().nCharsToSkip--;
 }
@@ -989,6 +999,7 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer)
 
 int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
 {
+checkUnicode();
 RTFSkipDestination aSkip(*this);
 switch (nKeyword)
 {
@@ -1277,6 +1288,8 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 
 int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 {
+if (nKeyword != RTF_HEXCHAR)
+checkUnicode();
 RTFSkipDestination aSkip(*this);
 sal_uInt8 cCh = 0;
 
@@ -1450,6 +1463,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 
 int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 {
+checkUnicode();
 RTFSkipDestination aSkip(*this);
 int nParam = -1;
 
@@ -1905,6 +1919,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 
 int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 {
+if (nKeyword != RTF_U)
+checkUnicode();
 RTFSkipDestination aSkip(*this);
 int nSprm = 0;
 RTFValue::Pointer_t pIntValue(new RTFValue(nParam));
@@ -2231,8 +2247,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_U:
 if ((SAL_MIN_INT16 <= nParam) && (nParam <= SAL_MAX_INT16))
 {
-OUString aStr(static_cast(nParam));
-text(aStr);
+m_aUnicodeBuffer.append(static_cast(nParam));
 m_aStates.top().nCharsToSkip = m_aStates.top().nUc;
 }
 break;
@@ -2550,6 +2565,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
 int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int 
nParam)
 {
+checkUnicode();
 RTFSkipDestination aSkip(*this);
 int nSprm = -1;
 RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0));
@@ -2650,6 +2666,7 @@ int RTFDocumentImpl::pushState()
 {
 //OSL_TRACE("%s before push: %d", OSL_THIS_FUNC, m_nGroup);
 
+checkUnicode();
 m_nGroupStartPos = Strm().Tell();
 RTFParserState aState;
 if (m_aStates.empty())
@@ -2728,6 +2745,7 @@ int RTFDocumentImpl::popState()
 {
 //OSL_TRACE("%s before pop: m_nGroup %d, dest state: %d", OSL_THIS_FUNC, 
m_nGroup, m_aStates.top().nDestinationState);
 
+checkUnicode();
 RTFSprms aSprms;
 RTFSprms aAttributes;
 OUStringBuffer aDestinationText;
@@ -3184,6 +3202,16 @@ void RTFDocumentImpl::setSkipUnknown(bool bSkipUnknown)
 m_bSkipUnknown = bSkipUnknown;
 }
 
+void RTFDocumentImpl::checkUnicode()
+{
+if (m_aUnicodeBuffer.getLength() > 0)
+{
+OSL_TRACE("debug, sending collected unicode chars");
+OUString aString = m_aUnicodeBuffer.makeStringAndClear();
+text(aString);
+}
+}
+
 RTFParserState::RTFParserState()
 : nInternalState(INTERNAL_NORMAL),
 nDestinationState(DESTINATION_NORMAL),
diff --git a/writerfilter/source/rtftok/rtfdocument

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

2011-11-28 Thread Tor Lillqvist

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

New commits:
commit 3ad35cbadbed5c8cf2d2bbcccd154768a5a62b34
Author: Tor Lillqvist 
Date:   Tue Nov 29 01:24:01 2011 +0200

Android hacking

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

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

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

diff --git a/android/examples/DocumentLoader/AndroidManifest.xml 
b/android/examples/DocumentLoader/AndroidManifest.xml
new file mode 100644
index 000..c137311
--- /dev/null
+++ b/android/examples/DocumentLoader/AndroidManifest.xml
@@ -0,0 +1,18 @@
+
+http://schemas.android.com/apk/res/android";
+  package="org.libreoffice.android.examples"
+  android:versionCode="1"
+  android:versionName="1.0">
+
+
+
+
+
+
+
+
+
+
diff --git 
a/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 
b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
new file mode 100644
index 000..41f69dd
--- /dev/null
+++ 
b/android/examples/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -0,0 +1,97 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+// Version: MPL 1.1 / GPLv3+ / LGPLv3+
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 1.1 (the "License"); you may not use this file except in compliance with
+// the License or as specified alternatively below. You may obtain a copy of
+// the License at http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// Major Contributor(s):
+// Copyright (C) 2011 Tor Lillqvist  (initial developer)
+// Copyright (C) 2011 SUSE Linux http://suse.com (initial developer's employer)
+//
+// All Rights Reserved.
+//
+// For minor contributions see the git repository.
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+// the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+// in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+// instead of those above.
+
+package org.libreoffice.android.examples;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.sun.star.uno.UnoRuntime;
+
+import org.libreoffice.android.Bootstrap;
+
+public class DocumentLoader
+extends Activity {
+
+@Override
+public void onCreate(Bundle savedInstanceState)
+{
+super.onCreate(savedInstanceState);
+
+try {
+
+Thread.sleep(2);
+
+Bootstrap.setup(this);
+
+Bootstrap.dlopen("libjuh.so");
+
+com.sun.star.uno.XComponentContext xContext = null;
+
+xContext = 
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
+
+com.sun.star.lang.XMultiComponentFactory xMCF =
+xContext.getServiceManager();
+
+Object oDesktop = xMCF.createInstanceWithContext(
+"com.sun.star.frame.Desktop", xContext);
+
+com.sun.star.frame.XComponentLoader xCompLoader =
+(com.sun.star.frame.XComponentLoader)
+ UnoRuntime.queryInterface(
+ com.sun.star.frame.XComponentLoader.class, oDesktop);
+
+// Getting the given starting directory
+String sUrl = "file:///assets/inputfile.doc";
+
+// Loadi

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit c0d26723ebcbfe81f3d66bc055168d6c584f3d36
Author: Bjoern Michaelsen 
Date:   Tue Nov 29 00:15:45 2011 +0100

do not loop

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 182c8ae..74ce553 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -35,18 +35,21 @@ gb_FULLDEPS=
 
 clean: clean-host clean-build
 
-subsequentcheck: dev-install
-   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+subsequentcheck: smoketestoo_native
+   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=T
 
-unitcheck: dev-install
-   @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+# instsetoo_native via build.pl already runs unittests
+unitcheck: instsetoo_native
+   @true
 
 all:
 
+gb_MAKETARGET=all
+# if we have only build as target use build instead of all
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out build,$(MAKECMDGOALS)),)
 gb_MAKETARGET=build
-else
-gb_MAKETARGET=all
+endif
 endif
 
 define gb_BuildplTarget_command
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Kohei Yoshida

 sc/inc/dpglobal.hxx  |2 +-
 sc/qa/unit/ucalc.cxx |   11 ---
 sc/source/core/data/dpshttab.cxx |   12 
 sc/source/core/data/dptablecache.cxx |   27 +--
 sc/source/ui/unoobj/dapiuno.cxx  |6 ++
 5 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit 1dcb62fe485e8082068679c4167e263b1957d94d
Author: Kohei Yoshida 
Date:   Mon Nov 28 17:31:02 2011 -0500

fdo#43304: Allow empty field labels in pivot tables.

Empty field labels are replaced with the column name.

diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 8502a30..200672a 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -125,7 +125,7 @@ public:
 ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){}
 ScDPItemData( sal_uLong nNF, const String & rS, double fV, sal_uInt8 bF 
):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){}
 ScDPItemData( const String& rS, double fV = 0.0, bool bHV = false, const 
sal_uLong nNumFormat = 0 , bool bData = true) ;
-ScDPItemData( ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, sal_uInt16 
nDocTab );
+ScDPItemData(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nDocTab, bool 
bLabel);
 
 voidSetString( const String& rS ) { aString = rS; mbFlag &= 
~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; }
 boolIsCaseInsEqual( const ScDPItemData& r ) const;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b287486..4ff4cd0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1323,17 +1323,6 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
-// Now, intentionally delete one of the field header names from the source 
range.
-ScMarkData aMarkData;
-aMarkData.SelectOneTable(0);
-m_pDoc->DeleteArea(1, 0, 1, 0, aMarkData, IDF_CONTENTS);
-printRange(m_pDoc, ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0), "Data sheet 
content (header removed)");
-
-// An attempt to clear the cache whose original data now has an invalid
-// field name (empty name) should not succeed.
-nErrId = pDPs->ClearCache(pDPObj2);
-CPPUNIT_ASSERT_MESSAGE("Clearing the cache while the source data is 
invalid should not be allowed.", nErrId != 0);
-
 pDPs->FreeTable(pDPObj2);
 CPPUNIT_ASSERT_MESSAGE("There shouldn't be any data pilot table stored 
with the document.",
pDPs->GetCount() == 0);
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 26cdf0f..a04bb5a 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -331,18 +331,6 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const
 if (!mpDoc)
 return STR_ERR_DATAPILOTSOURCE;
 
-const ScRange& aSrcRange = GetSourceRange();
-const ScAddress& s = aSrcRange.aStart;
-const ScAddress& e = aSrcRange.aEnd;
-for (SCCOL nCol = aSrcRange.aStart.Col(); nCol <= e.Col(); ++nCol)
-{
-if (mpDoc->IsBlockEmpty(s.Tab(), nCol, s.Row(), nCol, s.Row()))
-return STR_PIVOT_FIRSTROWEMPTYERR;
-}
-
-if (mpDoc->IsBlockEmpty(s.Tab(), s.Col(), s.Row()+1, e.Col(), e.Row()))
-return STR_PIVOT_ONLYONEROWERR;
-
 return 0;
 }
 
diff --git a/sc/source/core/data/dptablecache.cxx 
b/sc/source/core/data/dptablecache.cxx
index 98f73c7..d0ca15c 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -189,7 +189,7 @@ ScDPItemData::ScDPItemData(const String& rS, double fV, 
bool bHV, const sal_uLon
 {
 }
 
-ScDPItemData::ScDPItemData(ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, 
sal_uInt16 nDocTab) :
+ScDPItemData::ScDPItemData(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB 
nDocTab, bool bLabel) :
 nNumFormat( 0 ), fValue(0.0), mbFlag( 0 )
 {
 String aDocStr;
@@ -217,8 +217,24 @@ ScDPItemData::ScDPItemData(ScDocument* pDoc, SCROW nRow, 
sal_uInt16 nCol, sal_uI
 nNumFormat = pDoc->GetNumberFormat( ScAddress( nCol, nRow, nDocTab ) );
 isDate( nFormat ) ? ( mbFlag |= MK_DATE ) : (mbFlag &= ~MK_DATE);
 }
-else if ( pDoc->HasData( nCol,nRow, nDocTab ) )
-SetString ( aDocStr );
+else if (bLabel || pDoc->HasData(nCol, nRow, nDocTab))
+{
+if (bLabel && !aDocStr.Len())
+{
+// Replace an empty label string with column name.
+rtl::OUStringBuffer aBuf;
+aBuf.append(ScGlobal::GetRscString(STR_COLUMN));
+aBuf.append(sal_Unicode(' '));
+
+ScAddress aColAddr(nCol, 0, 0);
+rtl::OUString aColStr;
+aColAddr.Format(aColStr, SCA_VALID_COL, NULL);
+aBuf.append(aColStr);
+aDocStr = aBuf.makeStringAndClear();
+}
+
+SetString(aDocStr);
+}
 }
 
 bool ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
@@ -484,13 +500,12 @@ bool ScDPCache::InitFromDoc(ScDocu

[Libreoffice-commits] .: 5 commits - offapi/UnoApi_offapi.mk offapi/com sw/inc sw/source unotools/source

2011-11-28 Thread Michael Stahl

 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/awt/MaxChildrenException.idl |   27 ---
 offapi/com/sun/star/drawing/modules.idl  |7 --
 sw/inc/fmtanchr.hxx  |7 +-
 sw/source/core/crsr/pam.cxx  |   78 ---
 sw/source/core/layout/atrfrm.cxx |   57 +++-
 unotools/source/ucbhelper/ucbhelper.cxx  |2 
 7 files changed, 100 insertions(+), 79 deletions(-)

New commits:
commit 274da1e4d2b7756e80ff73dcf0007627db90a14b
Author: Michael Stahl 
Date:   Mon Nov 28 22:17:15 2011 +0100

utl::UCBContentHelper::EqualURLs: inverted return

diff --git a/unotools/source/ucbhelper/ucbhelper.cxx 
b/unotools/source/ucbhelper/ucbhelper.cxx
index 137d170..935620f 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -493,7 +493,7 @@ bool utl::UCBContentHelper::EqualURLs(
 RTL_CONSTASCII_USTRINGPARAM("no ucbhelper::ContentBroker")),
 css::uno::Reference());
 }
-return broker->getContentProviderInterface()->compareContentIds(
+return 0 == broker->getContentProviderInterface()->compareContentIds(
 (broker->getContentIdentifierFactoryInterface()->
  createContentIdentifier(canonic(url1))),
 (broker->getContentIdentifierFactoryInterface()->
commit 5469d397c6d31b7dc57574f13976155f78df582f
Author: Michael Stahl 
Date:   Mon Nov 28 21:51:53 2011 +0100

offapi: remove outdated doucmentation of removed stuff

diff --git a/offapi/com/sun/star/drawing/modules.idl 
b/offapi/com/sun/star/drawing/modules.idl
index 53d34c0..e0231a3 100644
--- a/offapi/com/sun/star/drawing/modules.idl
+++ b/offapi/com/sun/star/drawing/modules.idl
@@ -32,13 +32,6 @@ module com { module sun { module star { module drawing {
 
 /** The drawing framework is responsible for managing the resources used by
 the UI of the drawing applications.
-The framework is implemented by a set of sub controllers that are
-responsible for its different resources: XModuleController,
-XPaneController,
-XViewController,
-XToolbarController,
-XCommandController.
 The set of active resources is represented by the XConfiguration.
 The 
Date:   Mon Nov 28 21:51:18 2011 +0100

offapi: remove obsolete MaxChildrenException.idl

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f63ddd3..66e5944 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1675,7 +1675,6 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\
KeyModifier \
KeyStroke \
LineEndFormat \
-   MaxChildrenException \
MenuEvent \
MenuItemStyle \
MenuItemType \
diff --git a/offapi/com/sun/star/awt/MaxChildrenException.idl 
b/offapi/com/sun/star/awt/MaxChildrenException.idl
deleted file mode 100644
index 54bedbf..000
--- a/offapi/com/sun/star/awt/MaxChildrenException.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __com_sun_star_awt_MaxChildrenException_idl__
-#define __com_sun_star_awt_MaxChildrenException_idl__
-
-#include 
-
-//=
-
-module com {  module sun {  module star {  module awt {
-
-//=
-
-/** This exception is thrown when adding a child to a container that is full.
-
-@see XLayoutContainer
-@see com::sun::star::awt::XLayoutContainer::addChild
-
-@since OOo 3.0
- */
-exception MaxChildrenException: com::sun::star::uno::Exception
-{
-};
-
-//=
-
-}; }; }; };
-
-#endif
commit 59e298823019093ee788104c2e95cb0c7b145d05
Author: Michael Stahl 
Date:   Mon Nov 28 17:27:38 2011 +0100

SwPosition: handle un-registered SwIndex:

For frames anchored at paragraph, SwFmtAnchor::SetAnchor() creates
an anchor SwPosition that points at the SwTxtNode but with a SwIndex
that is not registered at the SwTxtNode.
SwXFrame::getAnchor() then creates a bookmark from that, which asserts
in the SwIndex comparison operators.

Work around this by adding ugly special handling for the case of 2
positions having their SwNodeIndex point to the same node but one of
them not having its SwIndex at the node.

It seems it is best to do this in SwPosition operators, as the SwIndex
operators lack the context to know if this inconsistency is allowed,
and it is unknown whether the bookmarks sort code is the only path that
triggers this assert.

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index b22bad8..8e59406 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -108,7 +108,21 @@ sal_Bool SwPosition::operator<(const SwPosition &rPos) 
const
 if( nNode < rPos.nNode )
 retur

[Libreoffice-commits] .: smoketestoo_native/makefile.mk

2011-11-28 Thread Jan Holesovsky

 smoketestoo_native/makefile.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c66b52b0b25f437a26069ffaf591a42ab6360180
Author: Jan Holesovsky 
Date:   Mon Nov 28 22:44:57 2011 +0100

Don't run smoketest when cross-compiling.

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 24732ab..eceea55 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -50,8 +50,11 @@ DEF1NAME = $(SHL1TARGET)
 .INCLUDE: installationtest.mk
 
 .IF "$(depend)" == ""
+# disable smoketest when cross-compiling for now; we can use wine at some 
stage (?)
+.IF "$(CROSS_COMPILING)" != "YES"
 ALLTAR : cpptest
 .END
+.END
 
 cpptest : $(SHL1TARGETN)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 8 commits - binaryurp/source sc/JunitTest_sc_unoapi.mk sc/Module_sc.mk sc/qa sc/source solenv/gbuild

2011-11-28 Thread Stephan Bergmann

 binaryurp/source/binaryany.cxx   |9 +-
 binaryurp/source/bridge.cxx  |  101 ++-
 binaryurp/source/bridgefactory.cxx   |6 -
 binaryurp/source/cache.hxx   |6 -
 binaryurp/source/lessoperators.cxx   |4 -
 binaryurp/source/marshal.cxx |   22 ++---
 binaryurp/source/proxy.cxx   |   25 +++---
 binaryurp/source/reader.cxx  |   36 -
 binaryurp/source/unmarshal.cxx   |   13 +--
 sc/JunitTest_sc_unoapi.mk|   48 
 sc/Module_sc.mk  |3 
 sc/qa/unoapi/Test.java   |   51 -
 sc/qa/unoapi/knownissues.xcl |   23 ++
 sc/qa/unoapi/makefile.mk |   48 
 sc/qa/unoapi/sc.sce  |2 
 sc/source/core/data/documen2.cxx |5 -
 solenv/gbuild/platform/unxgcc_gdbforjunit.sh |   11 +-
 17 files changed, 194 insertions(+), 219 deletions(-)

New commits:
commit b8d2671fd0d8055bdc3fb30482c898a456ac178f
Author: Stephan Bergmann 
Date:   Mon Nov 28 21:58:08 2011 +0100

Enabled sc/qa/unoapi again.

Currently often fails at shutdown, when Bridge::terminate ->
~ScAutoFormatObj -> ScGlobal::GetAutoFormat after ScGlobal::Clear
leads to ScAutoFormat ctor -> ScGlobal::GetRscString with null
ppRscString.

diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
new file mode 100644
index 000..7b31eca
--- /dev/null
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -0,0 +1,48 @@
+##
+## 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 Stephan Bergmann  (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.
+##
+
+$(eval $(call gb_JunitTest_JunitTest,sc_unoapi,SRCDIR))
+
+$(eval $(call gb_JunitTest_add_classes,sc_unoapi, \
+org.openoffice.test.UnoApiTest \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sc_unoapi, \
+$(OUTDIR)/bin/OOoRunner.jar \
+$(OUTDIR)/bin/jurt.jar \
+$(OUTDIR)/bin/ridl.jar \
+$(OUTDIR)/bin/test.jar \
+$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_set_defs,sc_unoapi,\
+$$(DEFS) \
+-Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc.sce \
+-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
+-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
+))
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 11ca264..6a18985 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -40,5 +40,8 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc \
 ))
 
+$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
+JunitTest_sc_unoapi \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unoapi/Test.java b/sc/qa/unoapi/Test.java
deleted file mode 100644
index 27d048b..000
--- a/sc/qa/unoapi/Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* 
-* for a copy of the LGPLv3 License.
-

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

2011-11-28 Thread Andras Timar

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

New commits:
commit 837711466e06648eca2152da9bd0cccfd672c6f0
Author: Andras Timar 
Date:   Mon Nov 28 21:38:05 2011 +0100

remove CR/LF linefeed from description

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

eliminate duplicate IDs

diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp 
b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
index bbe5888..af4ecd4 100755
--- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
+++ b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp
@@ -97,7 +97,7 @@
  
  
 
-   Stagnation Limit
+   Stagnation Limit
 
 
If this number of individuals found solutions 
within a close range, the iteration is stopped and the best of these values is 
chosen as optimal.
@@ -165,7 +165,7 @@
  
  
 
-   PS: Social Constant
+   PS: Social Constant
 
 
â¦ sets the importance of the global best point 
between all particles/individuals.
@@ -194,4 +194,4 @@
   
 

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - Makefile.in set_soenv.in solenv/gbuild

2011-11-28 Thread Jan Holesovsky

 Makefile.in |1 -
 set_soenv.in|1 +
 solenv/gbuild/extensions/post_AuxTargets.mk |2 +-
 solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4c41530eeda7d09d1607db7e697df6007c16d892
Author: Jan Holesovsky 
Date:   Mon Nov 28 21:06:26 2011 +0100

Use the build.pl parallelism again.

diff --git a/Makefile.in b/Makefile.in
index 5ae3d96..b1680f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,6 @@ SHELL=/usr/bin/env bash
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST/GNUmakefile.mk \
$(if @VERBOSE@,,-s) \
-   --jobs="@GMAKE_PARALLELISM@" \
$(1)
 endef
 
diff --git a/set_soenv.in b/set_soenv.in
index 3818f2b..b723e14 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1771,6 +1771,7 @@ else
ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,  "e" );
ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,"e" );
 }
+ToFile( "BUILD_NCPUS",  "@BUILD_NCPUS@", "e" );
 ToFile( "GMAKE_PARALLELISM","@GMAKE_PARALLELISM@", "e" );
 ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" );
 ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" );
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 0dcc15a..182c8ae 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -50,7 +50,7 @@ gb_MAKETARGET=all
 endif
 
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all 
gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
-P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
commit 7c292efd35e7925c0521d7cb1caab1410ae6f2bc
Author: Jan Holesovsky 
Date:   Mon Nov 28 21:06:10 2011 +0100

Fix typo.

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index fff1c10..c947ee3 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -62,7 +62,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD)
+   rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/source

2011-11-28 Thread Michael Meeks

 desktop/source/deployment/gui/dp_gui.hrc|5 +
 desktop/source/deployment/gui/dp_gui_dialog2.cxx|   84 ++--
 desktop/source/deployment/gui/dp_gui_dialog2.hxx|6 +
 desktop/source/deployment/gui/dp_gui_dialog2.src|   33 +++
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |1 
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx  |1 
 desktop/source/deployment/gui/dp_gui_theextmgr.hxx  |3 
 7 files changed, 121 insertions(+), 12 deletions(-)

New commits:
commit a6efec83cee0ab447f9e6a5716aee5d2165f95c7
Author: Olivier Hallot 
Date:   Mon Nov 28 10:54:55 2011 -0200

Fix for bug fdo39748, Easy-hack Cleanup extension list.

This patch introduces 3 new check box in the extension manager GUI to allow 
selection of extension type to display: bundled, shared or user. Dialog is 
automatically updated upon toggling checkbox.

On toggling each checkbox, the extension list is recreated from scratch and 
packages are added to the list depending on the checkmark state. Initial state 
is all checks marked.

diff --git a/desktop/source/deployment/gui/dp_gui.hrc 
b/desktop/source/deployment/gui/dp_gui.hrc
index 4924051..0419e63 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -41,9 +41,14 @@
 #define RID_EM_BTN_CHECK_UPDATES   13
 #define RID_EM_BTN_OPTIONS 14
 #define RID_EM_BTN_CANCEL  15
+#define RID_EM_FT_TYPE_EXTENSIONS  16
+#define RID_EM_CBX_BUNDLED 17
+#define RID_EM_CBX_SHARED  18
+#define RID_EM_CBX_USER19
 #define RID_EM_FT_GET_EXTENSIONS   20
 #define RID_EM_FT_PROGRESS 21
 #define RID_EM_FT_MSG  22
+#define RID_EM_BTN_SELECT  23
 
 // local RIDs:
 #define PB_LICENSE_DOWN 50
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2301eff..fe92e19 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -26,7 +26,6 @@
  *
  /
 
-
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
 #include "svtools/svtools.hrc"
@@ -98,6 +97,10 @@ namespace dp_gui {
 #define PROGRESS_WIDTH  60
 #define PROGRESS_HEIGHT 14
 
+#define USER_PACKAGE_MANAGEROUSTR("user")
+#define SHARED_PACKAGE_MANAGER  OUSTR("shared")
+#define BUNDLED_PACKAGE_MANAGER OUSTR("bundled")
+
 
//--
 struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
 {
@@ -588,7 +591,7 @@ String DialogHelper::getResourceString( sal_uInt16 id )
 
//--
 bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage 
> &xPackage )
 {
-if ( xPackage->getRepositoryName().equals( OUSTR("shared") ) )
+if ( xPackage->getRepositoryName().equals( SHARED_PACKAGE_MANAGER ) )
 return true;
 else
 return false;
@@ -705,6 +708,11 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, 
TheExtensionManager *pManager ) :
 m_aCloseBtn( this,  getResId( RID_EM_BTN_CLOSE ) ),
 m_aHelpBtn( this,   getResId( RID_EM_BTN_HELP ) ),
 m_aDivider( this ),
+m_aDivider2(this),
+m_aTypeOfExtTxt( this , getResId( RID_EM_FT_TYPE_EXTENSIONS ) ),
+m_aBundledCbx(this, getResId (RID_EM_CBX_BUNDLED)),
+m_aSharedCbx(this,  getResId (RID_EM_CBX_SHARED)),
+m_aUserCbx (this,   getResId (RID_EM_CBX_USER)),
 m_aGetExtensions( this, getResId( RID_EM_FT_GET_EXTENSIONS ) ),
 m_aProgressText( this,  getResId( RID_EM_FT_PROGRESS ) ),
 m_aProgressBar( this,   WB_BORDER + WB_3DLOOK ),
@@ -732,6 +740,10 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, 
TheExtensionManager *pManager ) :
 m_aGetExtensions.SetClickHdl( LINK( this, ExtMgrDialog, HandleHyperlink ) 
);
 m_aCancelBtn.SetClickHdl( LINK( this, ExtMgrDialog, HandleCancelBtn ) );
 
+m_aBundledCbx.SetClickHdl( LINK( this, ExtMgrDialog, HandleExtTypeCbx ) );
+m_aSharedCbx.SetClickHdl( LINK( this, ExtMgrDialog, HandleExtTypeCbx ) );
+m_aUserCbx.SetClickHdl( LINK( this, ExtMgrDialog, HandleExtTypeCbx ) );
+
 // resize update button
 Size aBtnSize = m_aUpdateBtn.GetSizePixel();
 String sTitle = m_aUpdateBtn.GetText();
@@ -750,9 +762,15 @@ ExtMgrDialog::ExtMgrDialog( Window *pParent, 
TheExtensionManager *pManager ) :
   (1 * m_aHelpBtn.GetSizePixel().Height()) +
   (1 * m_aGetExtensions.GetSizePixel().Height()) +
   (1 * m_pExtensionBox->GetMinOutputSizePixel().Height()) +
-  (3 * RSC_SP_DLG_INNERBORDER_LEFT) ) );
+  (3 * RSC_SP_DLG_INNERBORD

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit 70324f1e66bf64882d5ffc0b9215aa5524dc2e23
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 21:09:51 2011 +0100

dont overoptimize a plain make without an explicit target

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

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

New commits:
commit ceb55cd688cebede8cef8408540019fe54528869
Author: Michael Bauer 
Date:   Mon Nov 28 20:37:54 2011 +0100

[gd-GB] partitive vs genitive case month names

diff --git a/i18npool/source/localedata/data/gd_GB.xml 
b/i18npool/source/localedata/data/gd_GB.xml
index b08f61e..095cbe6 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -347,7 +347,7 @@
 DÃ¹bhlachd
 
 
-
+
 
 jan
 Faoi
@@ -408,7 +408,7 @@
 DÃ¹bh
 dhen DÃ¹bhlachd
 
-
+
 
 
 bc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Andras Timar

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

New commits:
commit a969d2aa5d38a501887d51995b817ed6f941c743
Author: Andras Timar 
Date:   Mon Nov 28 20:39:39 2011 +0100

enable l10n of nlpsolver

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

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

New commits:
commit 281d8e3ab8689a24f21f0dfd6d4de2ca1d46dc34
Author: Eike Rathke 
Date:   Mon Nov 28 20:03:14 2011 +0100

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

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

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

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit 92d68ce31ab351905e5411a523a557ea658b9802
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 19:42:21 2011 +0100

source build env for crosscompiles

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

[Libreoffice-commits] .: Makefile.in solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 Makefile.in |   10 ++
 solenv/gbuild/extensions/post_BuildplTargets.mk |6 +++---
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit cb4dbf934a2095422289723ed73a4d7cacb56afe
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 19:22:48 2011 +0100

some consistent naming cant hurt: cross-build-toolset -> cross_toolset

diff --git a/Makefile.in b/Makefile.in
index b6d06e6..5ae3d96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,13 +2,7 @@
 
 SHELL=/usr/bin/env bash
 
-ifeq (@CROSS_COMPILING@,YES)
-CROSS_TOOLSET_RULE:=cross-build-toolset
-else
-CROSS_TOOLSET_RULE:=
-endif
-
-.PHONY : build dev-install all cross-build-toolset install distro-pack-install 
clean clean-host clean-build distclean findunusedcode bootstrap
+.PHONY : build dev-install all cross_toolset install distro-pack-install clean 
clean-host clean-build distclean findunusedcode bootstrap
 
 define forward_to_gbuild
 @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST/GNUmakefile.mk \
@@ -50,7 +44,7 @@ build: Makefile
 dev-install: Makefile
@$(call forward_to_gbuild,$@)
 
-cross-build-toolset:
+cross_toolset:
@$(call forward_to_gbuild,$@)
 
 clean:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1fa6a2b..cba5b33 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -55,13 +55,13 @@ endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,$@)
 
-cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
$(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/an_ES.xml |   97 --
 1 file changed, 79 insertions(+), 18 deletions(-)

New commits:
commit e34584e74201bc2264c907e06c4f8b0026bd1f98
Author: Juan Pablo MartÃnez CortÃ©s 
Date:   Mon Nov 28 18:42:37 2011 +0100

added [an-ES] genitive month names, changed date formats, elaborated 
IndexKey

diff --git a/i18npool/source/localedata/data/an_ES.xml 
b/i18npool/source/localedata/data/an_ES.xml
index 0cbe0eb..f991221 100644
--- a/i18npool/source/localedata/data/an_ES.xml
+++ b/i18npool/source/localedata/data/an_ES.xml
@@ -20,8 +20,8 @@
   ,
   ;
   , 
-  , 
-   de
+   
+   de 

 
 
@@ -87,7 +87,7 @@
   D/MM/YY
 
 
-  DD,  de
+  DD  "de" 
 
 
   DD/MM/YY
@@ -96,34 +96,34 @@
   DD/MM/
 
 
-  D, MMM deYY
+  D MMM YY
 
 
-  D, MMM de
+  D MMM "de" 
 
 
-  D, MMM de
+  D MMM "de" 
 
 
-  D,  de
+  D  "de" 
 
 
-  D,  deYY
+  D  "de" YY
 
 
   NN, DD/MMM/YY
 
 
-  NN, D, MMM deYY
+  NN, D MMM deYY
 
 
-  NN, D,  de
+  NN, D  "de" 
 
 
-  D,  de
+  D  "de" 
 
 
-  MM/DD
+  DD/MM
 
 
   YY-MM-DD
@@ -137,13 +137,13 @@
   MM/YY
 
 
-  MMM/DD
+  DD/MMM
 
 
   
 
 
-  QQ YY
+  QQ "de" YY
 
 
   WW
@@ -188,7 +188,7 @@
 
   
   
-A-Z
+A Ã B-E Ã 
F-I Ã J-O Ã P-U Ã Ã V-Z
 0
 1
 p.
@@ -261,12 +261,12 @@
 
 
   jun
-  chun
+  chn
   chunio
 
 
   jul
-  chul
+  chl
   chulio
 
 
@@ -282,7 +282,7 @@
 
   oct
   oct
-  octubre
+  octobre
 
 
   nov
@@ -295,6 +295,67 @@
   aviento
 
   
+  
+
+  jan
+  chi
+  de chinero
+
+
+  feb
+  feb
+  de febrero
+
+
+  mar
+  mar
+  de marzo
+
+
+  apr
+  abr
+  d'abril
+
+
+  may
+  may
+  de mayo
+
+
+  jun
+  chn
+  de chunio
+
+
+  jul
+  chl
+  de chulio
+
+
+  aug
+  ago
+  d'agosto
+
+
+  sep
+  set
+  de setiembre
+
+
+  oct
+  oct
+  d'octobre
+
+  oct
+  oct
+  d'octobre
+
+
+  dec
+  avi
+  d'aviento
+
+  
   
 
   bc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sax/source xmloff/source

2011-11-28 Thread Radek Doulík

 sax/source/tools/converter.cxx  |   12 +---
 xmloff/source/core/xmluconv.cxx |2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit adf84183d445b0a58a90770d681acaf4db97ff8d
Author: Radek Doulik 
Date:   Mon Nov 28 18:25:01 2011 +0100

fix conversions from cm

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 198ea4d..b1629c8 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1972,17 +1972,17 @@ double 
Converter::GetConversionFactor(::rtl::OUStringBuffer& rUnit, sal_Int16 nS
 {
 case MeasureUnit::MM_100TH:
 {
-fRetval = .001;
+fRetval = 1000.0;
 break;
 }
 case MeasureUnit::MM_10TH:
 {
-fRetval = .01;
+fRetval = 100.0;
 break;
 }
 case MeasureUnit::MM:
 {
-fRetval = .1;
+fRetval = 10.0;
 psUnit = gpsMM;
 break;
 }
@@ -1992,8 +1992,7 @@ double 
Converter::GetConversionFactor(::rtl::OUStringBuffer& rUnit, sal_Int16 nS
 }
 case MeasureUnit::POINT:
 {
-// 0.01pt = 0.35 mm/100 (exactly)
-fRetval = 2.54 / 72.0;
+fRetval = 72.0 / 2.54;
 psUnit = gpsPT;
 break;
 }
@@ -2001,8 +2000,7 @@ double 
Converter::GetConversionFactor(::rtl::OUStringBuffer& rUnit, sal_Int16 nS
 default:
 {
 OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, "output 
unit not supported for cm values");
-// 0.0001in = 0.254 mm/100 (exactly)
-fRetval = 2.54;
+fRetval = 1 / 2.54;
 psUnit = gpsINCH;
 break;
 }
commit 7bf1fa3757133f12cf6ca624f8cee6ba5363e7d8
Author: Radek Doulik 
Date:   Mon Nov 28 18:24:11 2011 +0100

switch source and target units, so that it works right with sax conversions

diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 1cf482c..5ea85f1 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -340,7 +340,7 @@ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue,
 rString, m_pImpl->m_eCoreMeasureUnit);
 
 return ::sax::Converter::convertDouble(rValue, rString,
-eSrcUnit, m_pImpl->m_eCoreMeasureUnit);
+m_pImpl->m_eCoreMeasureUnit, eSrcUnit);
 }
 else
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - Makefile.in solenv/gbuild tail_build/Makefile

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit ce33bdce9d3499b7419b9210a2b5117ccda7ea32
Author: Bjoern Michaelsen 
Date:   Mon Nov 28 17:56:11 2011 +0100

targets must be postextension SRCDIR is empty otherwise

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

[Libreoffice-commits] .: filter/source

2011-11-28 Thread Caolán McNamara

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

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

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

diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx 
b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 7a4a539..ad8d889 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -29,7 +29,9 @@
 #define _XMLFILTERTABDIALOG_HXX_
 
 #include 
-#include 
+#include 
+#include 
+#include 
 
 class Window;
 class ResMgr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sax/source

2011-11-28 Thread Radek Doulík

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

New commits:
commit f970963fd7438fe4a026febf2046a2f4430d0a9f
Author: Radek Doulik 
Date:   Mon Nov 28 17:50:25 2011 +0100

added conversion from MeasureUnit::CM

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

[Libreoffice-commits] .: svx/source

2011-11-28 Thread Michael Meeks

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

New commits:
commit 59df2942aec0fd8123b15799c6375abc83b9937e
Author: Michael Meeks 
Date:   Mon Nov 28 16:48:17 2011 +

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

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

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

New commits:
commit 56a6704509bd24ac699d9ee9e4c430225f1b07cd
Author: Xuacu Saturio 
Date:   Mon Nov 28 17:34:52 2011 +0100

changed [ast-ES] date and currency formats

diff --git a/i18npool/source/localedata/data/ast_ES.xml 
b/i18npool/source/localedata/data/ast_ES.xml
index 1c2b5e5..e83257d 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -21,7 +21,7 @@
   ;
   , 

-   
+   de 

 
 
@@ -66,28 +66,28 @@
   0,00%
 
 
-  [CURRENCY]#.##0;-[CURRENCY]#.##0
+  #.##0[CURRENCY];-#.##0[CURRENCY]
 
 
-  [CURRENCY]#.##0,00;-[CURRENCY]#.##0,00
+  #.##0,00[CURRENCY];-#.##0,00[CURRENCY]
 
 
-  [CURRENCY]#.##0;[RED]-[CURRENCY]#.##0
+  #.##0[CURRENCY];[RED]-#.##0[CURRENCY]
 
 
-  [CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00
+  #.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY]
 
 
   CCC#.##0,00
 
 
-  [CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--
+  #.##0,--[CURRENCY];[RED]-#.##0,--[CURRENCY]
 
 
   D/MM/YY
 
 
-  DD,  
+  DD  "de" 
 
 
   DD/MM/YY
@@ -96,34 +96,34 @@
   DD/MM/
 
 
-  D, MMM YY
+  D MMM YY
 
 
-  D, MMM 
+  D MMM "de" 
 
 
-  D, MMM 
+  D MMM "de" 
 
 
-  D,  
+  D  "de" 
 
 
-  D,  YY
+  D  YY
 
 
   NN, DD/MMM/YY
 
 
-  NN, D, MMM YY
+  NN, D MMM YY
 
 
-  NN, D,  
+  NN, D  "de" 
 
 
-  D,  
+  D  "de" 
 
 
-  MM/DD
+  DD/MM
 
 
   YY-MM-DD
@@ -137,13 +137,13 @@
   MM/YY
 
 
-  MMM/DD
+  DD/MMM
 
 
   
 
 
-  QQ YY
+  QQ "de" YY
 
 
   WW
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: default_images/svx ooo_custom_images/hicontrast ooo_custom_images/industrial

2011-11-28 Thread Michael Meeks

 default_images/svx/res/cropmarkers.png   |binary
 default_images/svx/res/markers.png   |binary
 ooo_custom_images/hicontrast/svx/res/cropmarkers.png |binary
 ooo_custom_images/industrial/svx/res/cropmarkers.png |binary
 ooo_custom_images/industrial/svx/res/markers.png |binary
 5 files changed

New commits:
commit b18b6ad10ad4c0db9a846e52db7cff2b96c18257
Author: Stefan Knorr (astron) 
Date:   Sat Nov 26 10:58:14 2011 +0100

More changes to the new Tango handles, adding new Galaxy handles

diff --git a/default_images/svx/res/cropmarkers.png 
b/default_images/svx/res/cropmarkers.png
index b73c914..38cb5b3 100644
Binary files a/default_images/svx/res/cropmarkers.png and 
b/default_images/svx/res/cropmarkers.png differ
diff --git a/default_images/svx/res/markers.png 
b/default_images/svx/res/markers.png
index 0d25820..af608b2 100644
Binary files a/default_images/svx/res/markers.png and 
b/default_images/svx/res/markers.png differ
diff --git a/ooo_custom_images/hicontrast/svx/res/cropmarkers.png 
b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png
index b86d00a..f4c5fb4 100644
Binary files a/ooo_custom_images/hicontrast/svx/res/cropmarkers.png and 
b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png differ
diff --git a/ooo_custom_images/industrial/svx/res/cropmarkers.png 
b/ooo_custom_images/industrial/svx/res/cropmarkers.png
index 9b21b06..0114ed3 100644
Binary files a/ooo_custom_images/industrial/svx/res/cropmarkers.png and 
b/ooo_custom_images/industrial/svx/res/cropmarkers.png differ
diff --git a/ooo_custom_images/industrial/svx/res/markers.png 
b/ooo_custom_images/industrial/svx/res/markers.png
index 4411148..5b6115e 100644
Binary files a/ooo_custom_images/industrial/svx/res/markers.png and 
b/ooo_custom_images/industrial/svx/res/markers.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nlpsolver/prj

2011-11-28 Thread Michael Meeks

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

New commits:
commit 8eca6b52b82e04654a5a3245b0578c2e04a26740
Author: Michael Meeks 
Date:   Mon Nov 28 16:29:39 2011 +

add missing dep. to generate LICENSE

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

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

New commits:
commit c01ce861aced958302087117a5c5019d420b9d52
Author: Serg Bormant 
Date:   Mon Nov 28 17:18:10 2011 +0100

added [ru-RU] genitive case month names

diff --git a/i18npool/source/localedata/data/ru_RU.xml 
b/i18npool/source/localedata/data/ru_RU.xml
index 17405f6..fd64844 100644
--- a/i18npool/source/localedata/data/ru_RU.xml
+++ b/i18npool/source/localedata/data/ru_RU.xml
@@ -285,6 +285,68 @@
   ÐÐµÐºÐ°Ð±ÑÑ
 
   
+  
+
+  jan
+  ÑÐ½Ð²
+  ÑÐ½Ð²Ð°ÑÑ
+
+
+  feb
+  ÑÐµÐ²
+  ÑÐµÐ²ÑÐ°Ð»Ñ
+
+
+  mar
+  Ð¼Ð°Ñ
+  Ð¼Ð°ÑÑÐ°
+
+
+  apr
+  Ð°Ð¿Ñ
+  Ð°Ð¿ÑÐµÐ»Ñ
+
+
+  may
+  Ð¼Ð°Ð¹
+  Ð¼Ð°Ñ
+
+
+  jun
+  Ð¸ÑÐ½
+  Ð¸ÑÐ½Ñ
+
+
+  jul
+  Ð¸ÑÐ»
+  Ð¸ÑÐ»Ñ
+
+
+  aug
+  Ð°Ð²Ð³
+  Ð°Ð²Ð³ÑÑÑÐ°
+
+
+  sep
+  ÑÐµÐ½
+  ÑÐµÐ½ÑÑÐ±ÑÑ
+
+
+  oct
+  Ð¾ÐºÑ
+  Ð¾ÐºÑÑÐ±ÑÑ
+
+
+  nov
+  Ð½Ð¾Ñ
+  Ð½Ð¾ÑÐ±ÑÑ
+
+
+  dec
+  Ð´ÐµÐº
+  Ð´ÐµÐºÐ°Ð±ÑÑ
+
+  
   
 
   bc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nlpsolver/src

2011-11-28 Thread Michael Meeks

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

New commits:
commit 959d4ceac805d78142ace304f367fa0919359b3f
Author: Michael Meeks 
Date:   Mon Nov 28 15:49:00 2011 +

nlpsolver: add missing passive registration rdb

diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb
new file mode 100644
index 000..151ec5e
--- /dev/null
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb
@@ -0,0 +1,13 @@
+
+http://openoffice.org/2010/uno-components";>
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Thorsten Behrens

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

New commits:
commit e86982ad35010aa52375b6949eecb2b742e6485f
Author: Lionel Elie Mamane 
Date:   Thu Nov 24 19:01:22 2011 +0100

fdo#32347: reenable ADO URL helper UI

cleanup obsolete DISABLE_ADO logic

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Eike Rathke

 i18npool/source/localedata/data/be_BY.xml |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 9cd62fb8b99d5b36031ea98222f3c08d23d337b9
Author: Yury Tarasievich 
Date:   Mon Nov 28 16:31:40 2011 +0100

[be-BY] lower case month names

diff --git a/i18npool/source/localedata/data/be_BY.xml 
b/i18npool/source/localedata/data/be_BY.xml
index f866f46..5bb2f24 100644
--- a/i18npool/source/localedata/data/be_BY.xml
+++ b/i18npool/source/localedata/data/be_BY.xml
@@ -227,62 +227,62 @@
 
   jan
   ÑÑÑ
-  Ð¡ÑÑÐ´Ð·ÐµÐ½Ñ
+  ÑÑÑÐ´Ð·ÐµÐ½Ñ
 
 
   feb
   Ð»ÑÑ
-  ÐÑÑÑ
+  Ð»ÑÑÑ
 
 
   mar
   ÑÐ°Ðº
-  Ð¡Ð°ÐºÐ°Ð²ÑÐº
+  ÑÐ°ÐºÐ°Ð²ÑÐº
 
 
   apr
   ÐºÑÐ°
-  ÐÑÐ°ÑÐ°Ð²ÑÐº
+  ÐºÑÐ°ÑÐ°Ð²ÑÐº
 
 
   may
   ÑÑÐ°
-  Ð¢ÑÐ°Ð²ÐµÐ½Ñ
+  ÑÑÐ°Ð²ÐµÐ½Ñ
 
 
   jun
   ÑÑÑ
-  Ð§ÑÑÐ²ÐµÐ½Ñ
+  ÑÑÑÐ²ÐµÐ½Ñ
 
 
   jul
   Ð»ÑÐ¿
-  ÐÑÐ¿ÐµÐ½Ñ
+  Ð»ÑÐ¿ÐµÐ½Ñ
 
 
   aug
   Ð¶Ð½Ñ
-  ÐÐ½ÑÐ²ÐµÐ½Ñ
+  Ð¶Ð½ÑÐ²ÐµÐ½Ñ
 
 
   sep
   Ð²ÐµÑ
-  ÐÐµÑÐ°ÑÐµÐ½Ñ
+  Ð²ÐµÑÐ°ÑÐµÐ½Ñ
 
 
   oct
   ÐºÐ°Ñ
-  ÐÐ°ÑÑÑÑÑÐ½ÑÐº
+  ÐºÐ°ÑÑÑÑÑÐ½ÑÐº
 
 
   nov
   Ð»ÑÑ
-  ÐÑÑÑÐ°Ð¿Ð°Ð´
+  Ð»ÑÑÑÐ°Ð¿Ð°Ð´
 
 
   dec
   ÑÐ½Ðµ
-  Ð¡Ð½ÐµÐ¶Ð°Ð½Ñ
+  ÑÐ½ÐµÐ¶Ð°Ð½Ñ
 
   
   
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2011-11-28 Thread Andras Timar

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

New commits:
commit 6a8350377bbcc7e1bf9877ab71bf19510b0c0abe
Author: Andras Timar 
Date:   Mon Nov 28 15:47:09 2011 +0100

no space between number and percent or degree mark - consistency

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

[Libreoffice-commits] .: instsetoo_native/util

2011-11-28 Thread Petr Mladek

 instsetoo_native/util/makefile.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 790d758d561502b4d81a86308677fb198d16fce7
Author: Petr Mladek 
Date:   Fri Nov 25 19:27:21 2011 +0100

Do not create extra installation set for URE

Caused confusion. Was not uploaded to mirrors anyway.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 6f2643d..db11ea4 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -104,7 +104,7 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
$(eq,$(OS),MACOSX $(NULL)
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US ure_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US
 .ENDIF
 .ENDIF
 .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
@@ -118,7 +118,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack 
$(eq,$(OS),MACOSX $(
 .IF "$(GUI)"=="WNT"
 ALLTAR : openofficedevall ooodevhelppack sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US
 .ENDIF
 .ENDIF
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Thorsten Behrens

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

New commits:
commit 75dbef14bb484e018f9019c82b7bd9d54549401c
Author: Thorsten Behrens 
Date:   Mon Nov 28 14:18:04 2011 +0100

Headless got moved, fix gtk3 build.

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

Remove uses of OUString::setCharAt

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

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

2011-11-28 Thread Michael Stahl

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

New commits:
commit b1447d64662cdf9c7d8b11a9075cd13dfb800d4e
Author: Michael Stahl 
Date:   Mon Nov 28 14:29:27 2011 +0100

svl: remove unnecessary libs from cppunittest

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

[Libreoffice-commits] .: nlpsolver/prj

2011-11-28 Thread Michael Meeks

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

New commits:
commit 3915eb4ffef25b093b6880d35d1366ed61201979
Author: Michael Meeks 
Date:   Mon Nov 28 12:12:12 2011 +

add missing dmakefile to please gbuild

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

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Caolán McNamara

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

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

tidy up escaping so this works for me

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

[Libreoffice-commits] .: svtools/Executable_bmpsum.mk

2011-11-28 Thread Caolán McNamara

 svtools/Executable_bmpsum.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a653e506d5c2c561768b3c4ae6bdd80957941127
Author: CaolÃ¡n McNamara 
Date:   Mon Nov 28 11:44:19 2011 +

need extra lib

diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index daa332d..49ef1e6 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_add_api,bmpsum,\
 
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
 sal \
+comphelper \
 tl \
 vcl \
 $(gb_STDLIBS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Caolán McNamara

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

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

add defined but missing SfxInterface strings

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

there is no STR_VIEWSHELLBASE string

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

SfxInterfaces may legally have no translatable ui name

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

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

2011-11-28 Thread Michael Meeks

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

[Libreoffice-commits] .: sc/source

2011-11-28 Thread Noel Power

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

New commits:
commit e46454b676bedc5585456cc37c63c9e4ff7deaad
Author: Noel Power 
Date:   Mon Nov 28 10:58:31 2011 +

reorganise some resize logic

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

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Tor Lillqvist

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

New commits:
commit 7c8c4f783101a427da5e1f44eede054595a72605
Author: Tor Lillqvist 
Date:   Sun Nov 27 00:20:38 2011 +0200

Add comment about SOLAR_JAVA's alleged "BUILD" value

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

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

2011-11-28 Thread Thorsten Behrens

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

New commits:
commit d13e9baca52a9e8f07312ee03915bcdeac1ab4cd
Author: Khaled Hosny 
Date:   Mon Nov 28 11:51:42 2011 +0100

Fix Kashida justification when there is no Kashida glyph

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

[Libreoffice-commits] .: oox/inc

2011-11-28 Thread Jan Holesovsky

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

New commits:
commit dabe836c6ed66c5740582c17dbc39b2196608e6d
Author: Jan Holesovsky 
Date:   Mon Nov 28 11:24:14 2011 +0100

Fix visibility problem on Windows.

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

[Libreoffice-commits] .: i18npool/source

2011-11-28 Thread Thorsten Behrens

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

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

Add genitive and partitive month names for fi_FI locale

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

diff --git a/i18npool/source/localedata/data/fi_FI.xml 
b/i18npool/source/localedata/data/fi_FI.xml
index 1f7747d..7980be9 100644
--- a/i18npool/source/localedata/data/fi_FI.xml
+++ b/i18npool/source/localedata/data/fi_FI.xml
@@ -87,7 +87,7 @@
   P.K.
 
 
-  P. "ta" 
+  P.  
 
 
   PP.KK.VV
@@ -105,22 +105,22 @@
   P. KKK. 
 
 
-  P. "ta" 
+  P.  
 
 
   P.  
 
 
-  NN P. KKK"ta" VV
+  NN P. KKK VV
 
 
   NN PP. KKK VV
 
 
-  NN P. "ta" 
+  NN P.  
 
 
-  P. "ta" 
+  P.  
 
 
   KK-PP
@@ -286,6 +286,130 @@
   joulukuu
 
   
+  
+
+  jan
+  tammi
+  tammikuun
+
+
+  feb
+  helmi
+  helmikuun
+
+
+  mar
+  maalis
+  maaliskuun
+
+
+  apr
+  huhti
+  huhtikuun
+
+
+  may
+  touko
+  toukokuun
+
+
+  jun
+  kesÃ¤
+  kesÃ¤kuun
+
+
+  jul
+  heinÃ¤
+  heinÃ¤kuun
+
+
+  aug
+  elo
+  elokuun
+
+
+  sep
+  syys
+  syyskuun
+
+
+  oct
+  loka
+  lokakuun
+
+
+  nov
+  marras
+  marraskuun
+
+
+  dec
+  joulu
+  joulukuun
+
+  
+  
+
+  jan
+  tammi
+  tammikuuta
+
+
+  feb
+  helmi
+  helmikuuta
+
+
+  mar
+  maalis
+  maaliskuuta
+
+
+  apr
+  huhti
+  huhtikuuta
+
+
+  may
+  touko
+  toukokuuta
+
+
+  jun
+  kesÃ¤
+  kesÃ¤kuuta
+
+
+  jul
+  heinÃ¤
+  heinÃ¤kuuta
+
+
+  aug
+  elo
+  elokuuta
+
+
+  sep
+  syys
+  syyskuuta
+
+
+  oct
+  loka
+  lokakuuta
+
+
+  nov
+  marras
+  marraskuuta
+
+
+  dec
+  joulu
+  joulukuuta
+
+  
   
 
   bc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/source vcl/unx

2011-11-28 Thread Stephan Bergmann

 sw/source/ui/docvw/edtdd.cxx   |2 -
 sw/source/ui/docvw/edtwin.cxx  |   38 ++---
 sw/source/ui/inc/wrtsh.hxx |   15 --
 sw/source/ui/uiview/viewsrch.cxx   |6 ++---
 sw/source/ui/wrtsh/select.cxx  |   10 +
 sw/source/ui/wrtsh/wrtsh1.cxx  |3 --
 vcl/unx/kde4/warning_guard_qhash.h |2 +
 7 files changed, 41 insertions(+), 35 deletions(-)

New commits:
commit afb548ba6962c74ae99350bad0bd2c72c9ddd998
Author: Daisuke Nishino 
Date:   Sun Nov 27 15:55:22 2011 +0900

Hide function pointers

Removed some redundant "this->", sberg...@redhat.com.

diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index 766ae89..26617b6 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -75,7 +75,7 @@ void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt)
 aTimer.Stop();
 bDDTimerStarted = sal_False;
 if(!pSh->IsSelFrmMode())
-(pSh->*pSh->fnSetCrsr)(&rPt,sal_False);
+pSh->SetCursor(&rPt, false);
 aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
 }
 
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 18c13f1..23ba0bd 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -600,7 +600,7 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
 }
 else if ( bFrmDrag )
 {
-(rSh.*rSh.fnDrag)(&aModPt,sal_False);
+rSh.Drag(&aModPt, false);
 bDone = sal_True;
 }
 if ( !bDone )
@@ -614,7 +614,7 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
 rSh.SelectTableRowCol( *pRowColumnSelectionStart, &aPos, 
bIsRowDrag );
 }
 else
-(rSh.*rSh.fnSetCrsr)( &aModPt, sal_False );
+rSh.SetCursor( &aModPt, false );
 
 // It can be that a "jump" over a table cannot be accomplished like
 // that. So we jump over the table by Up/Down here.
@@ -3010,7 +3010,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 {
 // move cursor here so that it is not 
drawn in the
 // frame first; ShowCrsr() happens in 
LeaveSelFrmMode()
-bValidCrsrPos = !(CRSR_POSCHG & 
(rSh.*rSh.fnSetCrsr)(&aDocPos,sal_False));
+bValidCrsrPos = !(CRSR_POSCHG & 
rSh.SetCursor(&aDocPos, false));
 rSh.LeaveSelFrmMode();
 rView.AttrChangedNotify( &rSh );
 bCallBase = sal_False;
@@ -3389,7 +3389,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 {   // only temporary generate Move-Kontext because 
otherwise
 // the query to the content form doesn't work!!!
 MV_KONTEXT( &rSh );
-nTmpSetCrsr = (rSh.*rSh.fnSetCrsr)(&aDocPos,bOnlyText);
+nTmpSetCrsr = rSh.SetCursor(&aDocPos, bOnlyText);
 bValidCrsrPos = !(CRSR_POSCHG & nTmpSetCrsr);
 bCallBase = sal_False;
 }
@@ -3762,7 +3762,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 pSdrView->SetAngleSnapEnabled(sal_False);
 }
 
-(rSh.*rSh.fnDrag)( &aDocPt, rMEvt.IsShift() );
+rSh.Drag( &aDocPt, rMEvt.IsShift() );
 bIsInMove = sal_True;
 }
 else if( bIsDocReadOnly )
@@ -3802,9 +3802,9 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 rMEvt.GetModifier() + rMEvt.GetButtons() ) &&
 rSh.Is_FnDragEQBeginDrag() && !rSh.IsAddMode() ))
 {
-(rSh.*rSh.fnDrag)( &aDocPt,sal_False );
+rSh.Drag( &aDocPt, false );
 
-bValidCrsrPos = !(CRSR_POSCHG & 
(rSh.*rSh.fnSetCrsr)(&aDocPt,sal_False));
+bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPt, 
false));
 EnterArea();
 }
 }
@@ -3929,8 +3929,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 case MOUSE_LEFT + KEY_MOD2:
 if( rSh.IsBlockMode() && !rMEvt.IsSynthetic() )
 {
-(rSh.*rSh.fnDrag)( &aDocPt,sal_False );
-bValidCrsrPos = !(CRSR_POSCHG & 
(rSh.*rSh.fnSetCrsr)(&aDocPt,sal_False));
+rSh.Drag( &aDocPt, false );
+bValidCrsrPos = !(CRSR_POSCHG & rSh.SetCursor(&aDocPt, false));
 EnterArea();
 }
 break;
@@ -3994,7 +3994,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 bMBPressed = sal_False;
 if (

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

2011-11-28 Thread Radek Doulík

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

New commits:
commit c08d55eccc1b2e26d8d0408d70654751e8672fa7
Author: Radek Doulik 
Date:   Fri Nov 25 16:12:42 2011 +0100

make sure the bOOXMLShape flag is initialized

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

more debug info for emf+ rendering - path

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

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

2011-11-28 Thread Lionel Elie Mamane

 oox/source/drawingml/chart/seriesconverter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c613fa40a60cbd2c2664783a0aaebee6dfc4309
Author: Muthu Subramanian 
Date:   Wed Nov 2 13:50:20 2011 +0530

n#706792: Fix crash while opening certain pptx files.

Signed-off-by: Lionel Elie Mamane 

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 2a2564f..454496f 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -196,7 +196,7 @@ void DataLabelConverter::convertFromModel( const Reference< 
XDataSeries >& rxDat
 PropertySet aPropSet( rxDataSeries->getDataPointByIndex( 
mrModel.mnIndex ) );
 lclConvertLabelFormatting( aPropSet, getFormatter(), mrModel, 
rTypeGroup, false );
 
-if( !mrModel.mxLayout->mbAutoLayout )
+if( mrModel.mxLayout && !mrModel.mxLayout->mbAutoLayout )
 {
 // bnc#694340 - nasty hack - chart2 cannot individually
 // place data labels, let's try to find a useful
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-28 Thread Stephan Bergmann

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

New commits:
commit 5a8fef9b8e3ecc6658c477bdf903fe9e196db596
Author: Stephan Bergmann 
Date:   Mon Nov 28 10:13:57 2011 +0100

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

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

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

2011-11-28 Thread Stephan Bergmann

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

New commits:
commit 2af9040d38af7c7353855415dbea0134585058f3
Author: Stephan Bergmann 
Date:   Mon Nov 28 10:09:57 2011 +0100

Cleaned up utl::UCBContentHelper.

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

57 matches

Mail list logo