libreoffice-3.5 release build on Mac failed

[Norbert Thiebaud]

Petr,

the test build for 3.5.5 pn MacOSX failed see log below.
the culprit seems to be
http://cgit.freedesktop.org/libreoffice/core/commit/?id=89f45b9fef98650cc3166d9337c96e58f0c57c4f

Norbert

-=-=-

[ build CXX ] sfx2/source/dialog/filedlghelper
/Volumes/Raid0/rel/sfx2/source/dialog/filedlghelper.cxx: In member
function 'void sfx2::FileDialogHelper_Impl::verifyPath()':
/Volumes/Raid0/rel/sfx2/source/dialog/filedlghelper.cxx:1666: error:
conversion from 'const char [4]' to 'const String' is ambiguous
/Volumes/Raid0/rel/solver/unxmacxi.pro/inc/tools/string.hxx:387: note:
candidates are: String::String(char) 
/Volumes/Raid0/rel/solver/unxmacxi.pro/inc/tools/string.hxx:386: note:
String::String(sal_Unicode) 
/Volumes/Raid0/rel/solver/unxmacxi.pro/inc/tools/string.hxx:365: note:
String::String(int) 
/Volumes/Raid0/rel/sfx2/source/dialog/filedlghelper.cxx:1671: error:
no match for 'operator<<' in 'sal_detail_stream <<
((sfx2::FileDialogHelper_Impl*)this)->sfx2::FileDialogHelper_Impl::maFileName'
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:67:
note: candidates are: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT,
_Traits>::operator<<(std::basic_ostream<_CharT, _Traits>&
(*)(std::basic_ostream<_CharT, _Traits>&)) [with _CharT = char,
_Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:78:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(std::basic_ios<_CharT,
_Traits>& (*)(std::basic_ios<_CharT, _Traits>&)) [with _CharT = char,
_Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:90:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(std::ios_base&
(*)(std::ios_base&)) [with _CharT = char, _Traits =
std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:125:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT
= char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:159:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(long unsigned int)
[with _CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:102:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(bool) [with _CharT =
char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/ostream:176:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(short int) [with
_CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/ostream:187:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(short unsigned int)
[with _CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/ostream:191:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(int) [with _CharT =
char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/ostream:202:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(unsigned int) [with
_CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:183:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(long long int) [with
_CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:218:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(long long unsigned
int) [with _CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:242:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(double) [with _CharT =
char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/ostream:217:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(float) [with _CharT =
char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:265:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(long double) [with
_CharT = char, _Traits = std::char_traits]
/Developer/SDKs/MacOSX10.4u.sdk/usr/include/c++/4.0.0/bits/ostream.tcc:288:
note: std::basic_ostream<_CharT, _Traits>&
std::basic_ostream<_CharT, _Traits>::operator<<(cons

[Libreoffice-commits] .: sc/inc

[Stephan Bergmann]

 sc/inc/conditio.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a61b43cbf9c798f553e5d81c60f59a29e47d240f
Author: Stephan Bergmann 
Date:   Tue Jun 12 08:36:34 2012 +0200

-Werror,-Wmismatched-tags

Change-Id: If2b4118481dd265a81641d5cdf14f5095b8064e9

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index c68875f..2938ca7 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -70,7 +70,7 @@ enum ScConditionMode
 };
 
 class ScConditionalFormat;
-class ScDataBarInfo;
+struct ScDataBarInfo;
 
 namespace condformat
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/inc/colorscale.hxx |2 +
 sc/source/core/data/colorscale.cxx|9 +
 sc/source/ui/condformat/colorformat.cxx   |   54 +++---
 sc/source/ui/condformat/condformatdlg.cxx |   36 
 sc/source/ui/inc/colorformat.hrc  |2 +
 sc/source/ui/inc/colorformat.hxx  |3 +
 sc/source/ui/src/colorformat.src  |6 ++-
 7 files changed, 106 insertions(+), 6 deletions(-)

New commits:
commit 56de6cce83701f003416ad91b28c0dbca3a3d67e
Author: Markus Mohrhard 
Date:   Tue Jun 12 07:48:41 2012 +0200

small improvements to data bar dialog

Change-Id: I7eada5e24047d36c1625aa082ecc9e5d52f785ae

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 8e9c377..72349dc 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -80,6 +80,8 @@ public:
 void SetMax(bool bMax);
 void SetPercent(bool bPercent);
 void SetPercentile(bool bPercentile);
+
+void SetHasValue();
 };
 
 namespace databar
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index e6a5c8d..c677397 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -242,6 +242,15 @@ void ScColorScaleEntry::SetPercentile(bool bPercentile)
 mbPercentile = bPercentile;
 }
 
+void ScColorScaleEntry::SetHasValue()
+{
+mbPercentile = false;
+mbPercent = false;
+mbMin = false;
+mbMax = false;
+mpCell.reset();
+}
+
 namespace {
 
 double getMinValue(const ScRange& rRange, ScDocument* pDoc)
diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index de45815..2483364 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -105,12 +105,12 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, 
ScColorScaleEntry* pEntry
 pEntry->SetValue(nVal);
 break;
 case 4:
-//FIXME
-break;
-case 5:
 nVal = rtl::math::stringToDouble(rEd.GetText(), '.', ',');
+pEntry->SetHasValue();
 pEntry->SetValue(nVal);
 break;
+case 5:
+break;
 }
 }
 
@@ -146,7 +146,8 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, 
const ScDataBarForma
 maLbTypeMax( this, ScResId( LB_TYPE ) ),
 maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
 maEdMin( this, ScResId( ED_MIN ) ),
-maEdMax( this, ScResId( ED_MAX ) )
+maEdMax( this, ScResId( ED_MAX ) ),
+maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) )
 {
 Init();
 FreeResource();
@@ -171,6 +172,8 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, 
const ScDataBarForma
 ::SetType(rData.mpUpperLimit.get(), maLbTypeMax);
 SetValue(rData.mpLowerLimit.get(), maEdMin);
 SetValue(rData.mpUpperLimit.get(), maEdMax);
+
+TypeSelectHdl(NULL);
 }
 
 ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDataBarFormat* 
pFormat):
@@ -193,7 +196,8 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, 
ScDataBarFormat* pFo
 maLbTypeMax( this, ScResId( LB_TYPE ) ),
 maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
 maEdMin( this, ScResId( ED_MIN ) ),
-maEdMax( this, ScResId( ED_MAX ) )
+maEdMax( this, ScResId( ED_MAX ) ),
+maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) )
 {
 Init();
 FreeResource();
@@ -265,6 +269,10 @@ void ScDataBarSettingsDlg::Init()
 Point aPoint = maLbTypeMax.GetPosPixel();
 aPoint.Y() += 50;
 maLbTypeMax.SetPosPixel(aPoint);
+
+maLbTypeMin.SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl 
) );
+maLbTypeMax.SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl 
) );
+
 }
 
 namespace {
@@ -329,6 +337,8 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl )
 if(bWarn)
 {
 //show warning message and don't close
+WarningBox aWarn(this, WB_OK, maStrWarnSameValue );
+aWarn.Execute();
 }
 else
 {
@@ -337,4 +347,38 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl )
 return 0;
 }
 
+IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl )
+{
+sal_Int32 nSelectMin = maLbTypeMin.GetSelectEntryPos();
+if( nSelectMin == 0 || nSelectMin == 1)
+maEdMin.Disable();
+else
+{
+maEdMin.Enable();
+if(!maEdMin.GetText().Len())
+{
+if(nSelectMin == 2 || nSelectMin == 3)
+
maEdMin.SetText(rtl::OUString::valueOf(static_cast(50)));
+else
+
maEdMin.SetText(rtl::OUString::valueOf(static_cast(0)));
+}
+}
+
+sal_Int32 nSelectMax = maLbTypeMax.GetSelectEntryPos();
+if(nSelectMax == 0 || nSelectMax == 1)
+maEdMax.Disable();
+else
+{
+maEdMax.Enable();
+if(!maEdMax.GetText().Len())
+{
+if(nSelectMax == 2 || nSelectMax == 3)
+
maEdMax

Please don't confuse dead code and commented-out code

[Tor Lillqvist]

Just a small thing, but still: Several cleanups recently have removed
commented-out code. That is good. But the commit comments say that
"dead code" was removed. That is misleading.

Dead code is (according to Wikipedia) "code in the source code of a
program which is executed but whose result is never used in any other
computation". Personally I would have said that dead code is code that
is present in an executable (program or shared library) but is never
executed, i.e. a synonym to unreachable code.

Anyway, dead (unreachable) code is something else than commented-out code.

I am sure we have lots of actual dead/unreachable code too, and
finding and removing it reduces the size of our binaries. I suspect we
have significant amounts of code that would be reachable under some
complicated condition that actually never is true (any more). Figuring
out that can be hard of course.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source toolkit/source tools/source ucb/source unotools/inc unotools/source unoxml/source

[Takeshi Abe]

 sw/source/core/layout/calcmove.cxx  |   15 -
 sw/source/core/layout/flyincnt.cxx  |   11 
 sw/source/ui/shells/tabsh.cxx   |   10 ---
 toolkit/source/awt/vclxtabpagecontainer.cxx |   14 -
 toolkit/source/awt/vclxtoolkit.cxx  |   43 ---
 toolkit/source/awt/vclxwindow.cxx   |   13 
 toolkit/source/controls/unocontrols.cxx |9 ---
 tools/source/fsys/dirent.cxx|6 --
 ucb/source/ucp/odma/odma_provider.cxx   |7 --
 ucb/source/ucp/webdav/DateTimeHelper.cxx|   22 
 unotools/inc/unotools/viewoptions.hxx   |   28 --
 unotools/source/misc/fontcvt.cxx|   77 
 unoxml/source/dom/node.cxx  |4 -
 13 files changed, 259 deletions(-)

New commits:
commit 16738213c400f9192abc2ff6c08d7f711dee8d34
Author: Takeshi Abe 
Date:   Tue Jun 12 14:16:45 2012 +0900

nuke dead code

Change-Id: If8b6b4a3d9222726ae562e5b685710d86b5fe332

diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index b049913..70aafc0 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -731,10 +731,6 @@ void SwPageFrm::MakeAll()
 if ( nWidth < pSh->GetBrowseWidth() )
 nWidth = pSh->GetBrowseWidth();
 nWidth += + 2 * aBorder.Width();
-/*
-long nWidth = GetUpper() ? 
((SwRootFrm*)GetUpper())->GetBrowseWidth() + 2 * aBorder.Width() : 0;
-if ( nWidth < pSh->VisArea().Width() )
-nWidth = pSh->VisArea().Width(); */
 
 nWidth = Max( nWidth, 2L * aBorder.Width() + 4L*MM50 );
 Frm().Width( nWidth );
@@ -1066,17 +1062,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs 
&rAttrs )
 nUpper=0;
 nLower=0;
 }
-//// in balanced columned section frames we do not want the
-//// common border
-//sal_Bool bCommonBorder = sal_True;
-//if ( IsInSct() && GetUpper()->IsColBodyFrm() )
-//{
-//const SwSectionFrm* pSct = FindSctFrm();
-//bCommonBorder = 
pSct->GetFmt()->GetBalancedColumns().GetValue();
-//}
-//SwTwips nLower = bCommonBorder ?
-// rAttrs.GetBottomLine( this ) :
-// rAttrs.CalcBottomLine();
 
 (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : 
nLower);
 nUpper += nLower;
diff --git a/sw/source/core/layout/flyincnt.cxx 
b/sw/source/core/layout/flyincnt.cxx
index 676191b..5caf39b 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -282,17 +282,6 @@ void SwFlyInCntFrm::MakeAll()
 if ( !bValidSize )
 {
 bValidPrtArea = sal_False;
-/*
-// This is also done in the Format function, so I think
-// this code is not necessary anymore:
-long nOldWidth = aFrm.Width();
-const Size aRelSize( CalcRel( rFrmSz ) );
-aFrm.Width( aRelSize.Width() );
-
-if ( aFrm.Width() > nOldWidth )
-//Damit sich der Inhalt anpasst
-aFrm.Height( aRelSize.Height() );
-*/
 }
 
 if ( !bValidPrtArea )
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 32eb4e0..947f9ea 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -82,16 +82,6 @@
 #include 
 
 #include 
-
-//!!! new: insert table
-/*
-#include 
-#include 
-#include 
-#include 
-*/
-//!!!
-
 #include 
 #include 
 #include 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 618e052..2af2e05 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -85,19 +85,6 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, 
sal_Int32 nY ) throw(Run
 }
 
 VCLXWindow::draw( nX, nY );
-/*
-if ( pWindow )
-{
-OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
-if ( !pDev )
-pDev = pWindow->GetParent();
-
-Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() );
-Point aPos = pDev->PixelToLogic( Point( nX, nY ) );
-
-pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
-}
-*/
 }
 
 ::com::sun::star::awt::DeviceInfo VCLXTabPageContainer::getInfo() 
throw(RuntimeException)
@@ -177,7 +164,6 @@ void VCLXTabPageContainer::ProcessWindowEvent( const 
VclWindowEvent& _rVclWindow
 {
 case VCLEVENT_TABPAGE_ACTIVATE:
 {
-//allocateArea( maAllocation );
 sal_uLong page = (sal_uLong)_rVclWindowEvent.GetData();
 awt::tab::TabPageActivatedEvent aEvent(NULL,page);
   

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 5 commits - sfx2/inc sfx2/source

[Rafael Dominguez]

 sfx2/inc/sfx2/thumbnailview.hxx   |6 -
 sfx2/source/control/thumbnailview.cxx |  149 +-
 2 files changed, 61 insertions(+), 94 deletions(-)

New commits:
commit 467e2ea597ed37d63f1dd4ed0937e8a4d3d3ffc9
Author: Rafael Dominguez 
Date:   Tue Jun 12 00:18:21 2012 -0430

Disable drag&drop tracking and change item select state when clicked.

Change-Id: I7e3f6ec64ee98826d361008fed3e93cfcba39595

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 26849e9..44d0f7d 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -307,6 +307,12 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem, 
const Rectangle &aRect)
 {
 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
+Point aPos = aRect.TopLeft();
+const Size  aSize = aRect.GetSize();
+DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
+
+Control::SetFillColor();
+
 if ( IsColor() )
 maVirDev.SetFillColor( maColor );
 else if ( IsEnabled() )
@@ -316,12 +322,35 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem, 
const Rectangle &aRect)
 
 maVirDev.DrawRect( aRect );
 
+if ( pItem->mbSelected )
+{
+Rectangle aSelRect = aRect;
+Color aDoubleColor( rStyleSettings.GetHighlightColor() );
+
+// specify selection output
+aSelRect.Left()+= 4;
+aSelRect.Top() += 4;
+aSelRect.Right()   -= 4;
+aSelRect.Bottom()  -= 4;
+
+SetLineColor( aDoubleColor );
+aSelRect.Left()++;
+aSelRect.Top()++;
+aSelRect.Right()--;
+aSelRect.Bottom()--;
+DrawRect( aSelRect );
+aSelRect.Left()++;
+aSelRect.Top()++;
+aSelRect.Right()--;
+aSelRect.Bottom()--;
+DrawRect( aSelRect );
+}
+
 // Draw thumbnail
 SizeaImageSize = pItem->maImage.GetSizePixel();
 SizeaRectSize = aRect.GetSize();
-Point   aPos( aRect.Left(), aRect.Top() );
-aPos.X() += (aRectSize.Width()-aImageSize.Width())/2;
-aPos.Y() += (aRectSize.Height()-aImageSize.Height())/2;
+aPos.X() = aRect.Left() + (aRectSize.Width()-aImageSize.Width())/2;
+aPos.Y() = aRect.Top() + (aRectSize.Height()-aImageSize.Height())/2;
 
 sal_uInt16  nImageStyle  = 0;
 if( !IsEnabled() )
@@ -947,33 +976,31 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& 
rMEvt )
 if ( rMEvt.IsLeft() )
 {
 ThumbnailViewItem* pItem = ImplGetItem( ImplGetItem( 
rMEvt.GetPosPixel() ) );
-if ( mbSelection )
+
+if (pItem)
 {
-mbHighlight = true;
-if ( pItem )
+if ( mbSelection )
 {
+mbHighlight = true;
 mnHighItemId = mnSelItemId;
 ImplHighlightItem( pItem->mnId );
 }
-
-return;
-}
-else
-{
-if ( pItem && !rMEvt.IsMod2() )
+else
 {
-if ( rMEvt.GetClicks() == 1 )
+if ( !rMEvt.IsMod2() )
 {
-mbHighlight  = true;
-mnHighItemId = mnSelItemId;
-ImplHighlightItem( pItem->mnId );
-StartTracking( STARTTRACK_SCROLLREPEAT );
+if ( rMEvt.GetClicks() == 1 )
+{
+pItem->mbSelected = !pItem->mbSelected;
+DrawItem(pItem,GetItemRect(pItem->mnId));
+//StartTracking( STARTTRACK_SCROLLREPEAT );
+}
+else if ( rMEvt.GetClicks() == 2 )
+DoubleClick();
 }
-else if ( rMEvt.GetClicks() == 2 )
-DoubleClick();
-
-return;
 }
+
+return;
 }
 }
 
commit 79a5687f62f38092796ea47f54b81ce9dd6b6358
Author: Rafael Dominguez 
Date:   Tue Jun 12 00:10:58 2012 -0430

Set MouseButtonUp and MouseButtonDown as default control action.

Change-Id: If105303bb0a4d147e12c6501d412d199f316e971

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 489858a..26849e9 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -982,18 +982,11 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& 
rMEvt )
 
 void ThumbnailView::MouseButtonUp( const MouseEvent& rMEvt )
 {
-// because of SelectionMode
-if ( rMEvt.IsLeft() && mbSelection )
-ImplEndTracking( rMEvt.GetPosPixel(), false );
-else
-Control::MouseButtonUp( rMEvt );
+Control::MouseButtonUp( rMEvt );
 }
 
 void ThumbnailView::MouseMove( const MouseEv

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

[Markus Mohrhard]

 sc/inc/colorscale.hxx |2 +-
 sc/source/ui/condformat/condformatdlg.cxx |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a3451df90e0db9d37a7c6950c2eea53a96616e12
Author: Markus Mohrhard 
Date:   Tue Jun 12 05:25:28 2012 +0200

seems like windows does not like that

Change-Id: I3c694af4554f984274e179739475077c46db4028

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index e93d5b6..8e9c377 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -85,7 +85,7 @@ public:
 namespace databar
 {
 
-enum SC_DLLPUBLIC ScAxisPostion
+enum ScAxisPostion
 {
 NONE,
 AUTOMATIC,
diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index bc958da..54d5ba1 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -870,7 +870,6 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
 {
 if(maLbCondType.GetSelectEntryPos() == 6 || 
maLbCondType.GetSelectEntryPos() == 7)
 {
-std::cout << "OldSize: " << maEdVal1.GetSizePixel().Width() << " " << 
maEdVal1.GetSizePixel().Height() << std::endl;
 maEdVal1.SetSizePixel(maEdVal2.GetSizePixel());
 maEdVal2.Show();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - officecfg/registry sc/inc sc/uiconfig

[Markus Mohrhard]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   10 --
 sc/inc/colorscale.hxx |4 +-
 sc/inc/sc.hrc |   15 
--
 sc/uiconfig/scalc/menubar/menubar.xml |2 -
 4 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 53d2fc053390c1ca6676f773cc60312e9d44af24
Author: Markus Mohrhard 
Date:   Tue Jun 12 04:45:51 2012 +0200

make new conditional format menu appear

Change-Id: I720037b7759a64d99cd08cf44ce9ae26b8f21873

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 80f6c86..5bf1ec3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -444,16 +444,6 @@
 C~onditional Formatting
 
 
-
-
-Data Bar...
-
-
-
-
-Color Scale...
-
-
 
 
 Conditional Formatting...
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e09ea16..e2949d4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1229,14 +1229,13 @@
 #define RID_SCDLG_TEXT_IMPORT_OPTIONS   (SC_DIALOGS_START + 152)
 #define RID_POPUP_FILTER(SC_DIALOGS_START + 153)
 #define RID_SCDLG_TAB_BG_COLOR  (SC_DIALOGS_START + 154)
-#define RID_SCDLG_FORMULA_CALCOPTIONS   (SC_DIALOGS_START + 155)
-#define RID_SCPAGE_SORTKEY_FIELDS   (SC_DIALOGS_START + 156)
-#define RID_SCDLG_SORTKEY   (SC_DIALOGS_START + 157)
-#define RID_SCDLG_COLORSCALE(SC_DIALOGS_START + 158)
-#define RID_SCDLG_DATABAR   (SC_DIALOGS_START + 159)
-#define RID_COND_ENTRY  (SC_DIALOGS_START + 160)
-
-#define SC_DIALOGS_END  (SC_DIALOGS_START + 161)
+#define RID_SCDLG_DATABAR   (SC_DIALOGS_START + 155)
+#define RID_COND_ENTRY  (SC_DIALOGS_START + 156)
+#define RID_SCDLG_FORMULA_CALCOPTIONS   (SC_DIALOGS_START + 157)
+#define RID_SCPAGE_SORTKEY_FIELDS   (SC_DIALOGS_START + 158)
+#define RID_SCDLG_SORTKEY   (SC_DIALOGS_START + 159)
+
+#define SC_DIALOGS_END  (SC_DIALOGS_START + 160)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; }
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index fbea1b9..af9f701 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -261,7 +261,7 @@
 
 
  
-   
+   
  

 
commit 7618860eac39b89bce9958a3271033a8b39407b7
Author: Markus Mohrhard 
Date:   Mon Jun 11 23:12:04 2012 +0200

need to export all symbols for color formats

Change-Id: I18209f594ac6aa9ba03081342532e37a7b686571

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 56e653e..e93d5b6 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -85,7 +85,7 @@ public:
 namespace databar
 {
 
-enum ScAxisPostion
+enum SC_DLLPUBLIC ScAxisPostion
 {
 NONE,
 AUTOMATIC,
@@ -94,7 +94,7 @@ enum ScAxisPostion
 
 }
 
-struct ScDataBarFormatData
+struct SC_DLLPUBLIC ScDataBarFormatData
 {
 ScDataBarFormatData():
 mbGradient(true),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 3.6.0 Beta1 available

[Thorsten Behrens]

Dear Community,

The Document Foundation is happy to announce the first beta release of
LibreOffice 3.6.0. The upcoming 3.6.0 will be our fourth major release
in two years, and comes with a nice set of new features. Please be
aware that LibreOffice 3.6.0 Beta1 is not ready for production use,
you should continue to use LibreOffice 3.5.4 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

A note for Windows users: this beta release installs in parallel to
your current stable build, and thus can be easily tested alongside.

The (still growing) list of features for the upcoming 3.6.0 is on our
wiki - please help filling gaps there, e.g. by providing more
screenshots:

 http://wiki.documentfoundation.org/ReleaseNotes/3.6

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the beta quality is to run some specific manual
tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://challenge.documentfoundation.org/

A list of known issues and fixed bugs with 3.6.0 Beta1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/3.6.0/Beta1

Please find the list of changes against LibreOffice 3.5.4 here:

  
http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-6-release-3.5.99.1.log

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors


pgpC0W5BXf2Pw.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: bin/lo-commit-stat

[Thorsten Behrens]

 bin/lo-commit-stat |   35 +--
 1 file changed, 29 insertions(+), 6 deletions(-)

New commits:
commit 9852f01df91cdf5bb5ac924d2354eac8a6481df7
Author: Thorsten Behrens 
Date:   Tue Jun 12 03:34:33 2012 +0200

Optionally output wiki-markup from lo-commit-stat

Starts to be a bit annoying to roll shell-sed every release.
We fix too many bugs.

Change-Id: I34b0e9c2bf2c43f84abd555a9d2ac7dde0b6ba3a

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 0697432..310548e 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -25,11 +25,16 @@ sub search_bugs()
 my $bug_orig;
 while (defined $bug) {
 
-# match fdo#123, rhz#123, i#123
+# match fdo#123, rhz#123, i#123, #123
 # but match only bug number with >= 4 digits
-if ( $line =~ m/(\w*\#+\d{4,})/ ) {
+if ( $line =~ m/(\w+\#+\d{4,})/ ) {
 $bug_orig = $1;
 $bug = $1;
+   # default to issuezilla for the #123 variant
+# but match only bug number with >= 4 digits
+} elsif ( $line =~ m/(\#)(\d{4,})/ ) {
+$bug_orig = $1 . $2;
+$bug = "i#$2";
 # match #i123#
 } elsif ( $line =~ m/(\#i)(\d+)(\#)/ ) {
 $bug_orig = $1 . $2 . $3;
@@ -48,6 +53,12 @@ sub search_bugs()
 
 # bnc# is preferred over n# for novell bugs
 $bug =~ s/^n\#/bnc#/;
+# deb# is preferred over debian# for debian bugs
+$bug =~ s/^debian\#/deb#/;
+# easyhack# is sometimes used for fdo# - based easy hacks
+$bug =~ s/^easyhack\#/fdo#/;
+# someone mistyped fdo as fd0
+$bug =~ s/^fd0\#/fdo#/;
 # save the bug number
 %{$pdata->{$piece}{$commit_id}{'bugs'}} = () if (! defined 
%{$pdata->{$piece}{$commit_id}{'bugs'}});
 $pdata->{$piece}{$commit_id}{'bugs'}{$bug} = 1;
@@ -307,15 +318,19 @@ sub get_bug_name($$)
 } else {
 print "warning: not found; using commit message\n";
 }
+} else {
+print "\n";
 }
+} else {
+print "\n";
 }
 
 return $summary;
 }
 
-sub print_bugs($$)
+sub print_bugs($$$)
 {
-my ($pdata, $log) = @_;
+my ($pdata, $log, $convert_func) = @_;
 
 # associate bugs with their summaries and fixers
 my %bugs = ();
@@ -345,7 +360,7 @@ sub print_bugs($$)
 $authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
 }
 
-printf $log $bug . " " . $summary . $authors . "\n";
+printf $log "%s %s%s\n", $convert_func->($bug), $summary, $authors;
 }
 }
 
@@ -384,6 +399,7 @@ sub usage()
   " commit-log--.log; the 
branch name\n" .
   " is detected automatically\n" .
   " --bugs  print just bug fixes\n" .
+  " --wikibugs  print just bug fixes, use wiki markup\n" .
   " --bug-numbers   print just fixed bug numbers\n" .
   " --rev-list  use \"git rev-list\" instead of \"git log\"; 
useful to check\n" .
   " differences between branches\n" .
@@ -432,6 +448,9 @@ foreach my $arg (@ARGV) {
 } elsif ($arg eq '--bugs') {
 $log_prefix = "bugfixes";
 $print_mode = "bugs";
+} elsif ($arg eq '--wikibugs') {
+$log_prefix = "bugfixes";
+$print_mode = "wikibugs";
 } elsif ($arg eq '--bug-numbers') {
 $log_prefix = "bugnumbers";
 $print_mode = "bugnumbers";
@@ -462,7 +481,11 @@ load_data(\%data, $top_dir, $piece, $branch_name, 
$git_command);
 
 $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name);
 if ( $print_mode eq "bugs" ) {
-print_bugs(\%data, $log);
+# identity-transform bug ids
+print_bugs(\%data, $log, sub { return $_[0] } );
+} elsif ( $print_mode eq "wikibugs" ) {
+# wiki-ize bug ids
+print_bugs(\%data, $log, sub { $_[0] =~ s/(.*)\#(.*)/* {{$1|$2}}/; return 
$_[0] });
 } elsif ( $print_mode eq "bugnumbers" ) {
 print_bugnumbers(\%data, $log);
 } else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] gerrit now synced from freedesktop

[Bjoern Michaelsen]

Hi all,

quoting http://sweetshark.livejournal.com/12605.html:
The master and the 3.5.x and 3.6.x release branches (links require OpenID
login) on gerrit.libreoffice.org are now synced every 15 minutes by the
friendly LibreOffice gerrit bot from freedesktop. If you based your patch on
these branches more than 15 minutes ago, you can be sure to be able to send it
there for review without any hassle. Once we make the gerrit repository our
reference, this syncing isnt needed anymore of course (we would only need to
push those changes to freedesktop then -- the other way around). But for all
practical proposes, everyone should be able to submit his patches to gerrit
with this.

One additional note: As gerrit now gets regular updates from fdo, because of
the Change-IDs gerrit will notice when your patch is pushed, so you and all
reviewers will get a email about that -> instant win.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED] Remove non-functional Hide/ShowStatusText

[Caolán McNamara]

On Mon, 2012-06-11 at 22:10 +0200, Thomas Arnhold wrote:
> I have some questions:
> 
> - what's the matter about sfx2/inc/sfx2/sfxcommands.h? A quick check did 
> offer me that many of those defines are never used. Is it right to 
> remove the unused ones?

I've wondered myself. I don't know, but I'm inclined to think, like a
lot of stuff, that it's remnants of partially moving from one old scheme
to a new scheme and leaving unconverted bits behind. So best thing IMO
is to strip down to what's actually needed. and in the process figure
out from what's left behind what bits didn't get converted from old to
new.

> - hrc files: There were some comments that number XY was removed, should 
> I do this as well? I did this only at sw/source/ui/docvw/docvw.hrc 
> because the numbers before and after were set.

These .hrc files are super ugly hard coded numbers. Something gets
removed and rather than generate a huge diff a "hole" gets left which
can get reused, but noone ever reuses it cause its easier to add one at
the end rather than battle scary comments :-). AFAICS in general you
could happily change all the numbers around as long as they don't
conflict. That said, I at least once found old super-horrible code that
would "know" that adding +X to a id would find a matching one, e.g.
redostring_id = undostring_id + 3.

> - STR_DOC_LOADING and STR_CHAIN_OK were unused. They are represented in 
> many po files. Is there an easier way to remove them or only per regex/sed?

Stuff in .po files I think basically "take care of themselves", but
maybe Andras can give the right answer for that. I *presume* there's a
form of garbage collection taking place there so that translations of
removed stuff doesn't continue forever.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 sfx2/inc/sfx2/XmlIdRegistry.hxx|9 ++---
 sfx2/source/doc/DocumentMetadataAccess.cxx |7 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 40b7eff9075c88d80fb0f3472d2671c5d2c72d0d
Author: Michael Stahl 
Date:   Mon Jun 11 23:18:23 2012 +0200

un-inline isValidXmlId (MSVC doesn't like it anymore)

Change-Id: I59872f6e7fbdfc73875a45912b93d01b4379aec7

diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 691bfaa..38db1f9 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx
@@ -47,13 +47,8 @@ namespace sfx2 {
 /** is i_rIdref a valid NCName ? */
 bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref);
 
-extern inline bool
-isValidXmlId(::rtl::OUString const & i_rStreamName,
-::rtl::OUString const & i_rIdref)
-{
-return isValidNCName(i_rIdref) && ( i_rStreamName == "content.xml" || 
i_rStreamName == "styles.xml" );
-}
-
+bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const & i_rStreamName,
+::rtl::OUString const & i_rIdref);
 
 // XML ID handling ---
 
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx 
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index bbe7555..4fb52ec 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -116,6 +116,13 @@ static bool isStylesFile (::rtl::OUString const & i_rPath)
 return i_rPath == s_styles;
 }
 
+bool isValidXmlId(::rtl::OUString const & i_rStreamName,
+::rtl::OUString const & i_rIdref)
+{
+return isValidNCName(i_rIdref)
+&& (isContentFile(i_rStreamName) || isStylesFile(i_rStreamName));
+}
+
 static bool isReservedFile(::rtl::OUString const & i_rPath)
 {
 return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == 
s_meta || i_rPath == s_settings;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Thomas Arnhold]

 sw/source/ui/docvw/docvw.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22a5dfb94918cbade4800122c75d88ae73e39240
Author: Thomas Arnhold 
Date:   Mon Jun 11 22:54:26 2012 +0200

build fix: restore STR_CHAIN_OK

Change-Id: I04230c4c38978340afa91eefb1886de0998967f8

diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc
index bf75602..305fb5b 100644
--- a/sw/source/ui/docvw/docvw.hrc
+++ b/sw/source/ui/docvw/docvw.hrc
@@ -58,7 +58,7 @@
 
 
 #define STR_EXPORT_GRAFIK_TITLE (RC_DOCVW_BEGIN + 1)
-// FREE, was STR_CHAIN_OK
+#define STR_CHAIN_OK(RC_DOCVW_BEGIN + 2)
 #define STR_CHAIN_NOT_EMPTY (RC_DOCVW_BEGIN + 3)
 #define STR_CHAIN_IS_IN_CHAIN   (RC_DOCVW_BEGIN + 4)
 #define STR_CHAIN_WRONG_AREA(RC_DOCVW_BEGIN + 5)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix proposed for fdo#49178

[julien2412]

Hello,

I proposed a quite straightforward patch here for the bug fdo#49178 (CRASH
when FILEOPEN particular RTF) here :
https://bugs.freedesktop.org/attachment.cgi?id=62903

Is it ok to commit and push it ?

Julien.

--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-49178-tp3989525.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayout' - sfx2/source vcl/inc vcl/source

[Caolán McNamara]

 sfx2/source/dialog/basedlgs.cxx |   48 --
 vcl/inc/vcl/dialog.hxx  |6 ++
 vcl/inc/vcl/tabdlg.hxx  |1 
 vcl/source/window/dialog.cxx|  105 +---
 vcl/source/window/tabdlg.cxx|9 ++-
 5 files changed, 113 insertions(+), 56 deletions(-)

New commits:
commit bfa1bd77fa62e31e25c9a86e4509bf2ae2cdf3d7
Author: Caolán McNamara 
Date:   Mon Jun 11 21:25:34 2012 +0100

move dialog-contained widget builder into dialog baseclass

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 8bdb453..db45163 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -163,38 +163,6 @@ void SfxModalDialog::init()
 GetDialogData_Impl();
 }
 
-#define BASEPATH_SHARE_LAYER 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIConfig"))
-#define RELPATH_SHARE_LAYER 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice.cfg"))
-#define SERVICENAME_PATHSETTINGS 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings"))
-
-rtl::OUString getUIRootDir()
-{
-namespace css = ::com::sun::star;
-
-/*to-do, check if user config has an override before using shared one, 
etc*/
-css::uno::Reference< css::beans::XPropertySet > xPathSettings(
-
::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS),
-css::uno::UNO_QUERY_THROW);
-
-::rtl::OUString sShareLayer;
-xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer;
-
-// "UIConfig" is a "multi path" ... use first part only here!
-sal_Int32 nPos = sShareLayer.indexOf(';');
-if (nPos > 0)
-sShareLayer = sShareLayer.copy(0, nPos);
-
-// Note: May be an user uses URLs without a final slash! Check it ...
-nPos = sShareLayer.lastIndexOf('/');
-if (nPos != sShareLayer.getLength()-1)
-sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-
-sShareLayer += RELPATH_SHARE_LAYER; // folder
-sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-/*to-do, can we merge all this foo with existing soffice.cfg finding code, 
etc*/
-return sShareLayer;
-}
-
 // ---
 
 SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
@@ -210,29 +178,15 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const 
ResId &rResId )
 pInputSet(0),
 pOutputSet(0)
 {
-sal_Int32 nUIid = static_cast(nUniqId);
-rtl::OUString sPath = rtl::OUStringBuffer(getUIRootDir()).
-append(rResId.GetResMgr()->getPrefixName()).
-append("/ui/").
-append(nUIid).
-appendAscii(".ui").
-makeStringAndClear();
-fprintf(stderr, "path %s id %d\n", rtl::OUStringToOString(sPath, 
RTL_TEXTENCODING_UTF8).getStr(), nUniqId);
-
-osl::File aUIFile(sPath);
-osl::File::RC error = aUIFile.open(osl_File_OpenFlag_Read);
-if (error == osl::File::E_None)
-m_pUIBuilder = new VclBuilder(this, sPath, 
rtl::OString::valueOf(nUIid));
 init();
 }
 
 SfxModalDialog::SfxModalDialog(Window *pParent, const rtl::OString& rID, const 
rtl::OUString& rUIXMLDescription )
-:   ModalDialog(pParent, 0), //todo
+:   ModalDialog(pParent, rID, rUIXMLDescription),
 nUniqId(0), //todo
 pInputSet(0),
 pOutputSet(0)
 {
-m_pUIBuilder = new VclBuilder(this, getUIRootDir() + rUIXMLDescription, 
rID);
 init();
 }
 
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 7f2670a..e447e13 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -68,10 +68,12 @@ private:
 
 DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
 DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* );
+
 protected:
 using Window::ImplInit;
 SAL_DLLPRIVATE voidImplInit( Window* pParent, WinBits nStyle );
 SAL_DLLPRIVATE voidImplDialogRes( const ResId& rResId );
+SAL_DLLPRIVATE WinBits init(Window *pParent, const ResId& rResId);
 
 VclBuilder  *m_pUIBuilder;
 
@@ -81,11 +83,13 @@ public:
 
 protected:
 Dialog( WindowType nType );
+Dialog( Window* pParent, const rtl::OString& rID, const 
rtl::OUString& rUIXMLDescription, WindowType nType );
 virtual voidDraw( OutputDevice* pDev, const Point& rPos, const Size& 
rSize, sal_uLong nFlags );
 
 public:
 Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
 Dialog( Window* pParent, const ResId& rResId );
+Dialog( Window* pParent, const rtl::OString& rID, const 
rtl::OUString& rUIXMLDescription );
 virtual ~Dialog();
 
 virtual longNotify( NotifyEvent& rNEvt );
@@ -156,6 +160,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog
 
 public:
 ModelessDialog( Window* pParent, const ResId& rResId );
+ModelessDialog( Window* pParent, const rtl::OStr

[Libreoffice-commits] .: vcl/inc

[Thomas Arnhold]

 vcl/inc/win/saldata.hxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 06d358fea294617d8618e9cf6fadb1f162fd6014
Author: Thomas Arnhold 
Date:   Mon Jun 11 22:16:59 2012 +0200

Remove unused InterceptChildWindowKeyDown: further cleanup

Change-Id: Ie894c1a1989433e4faa14ca469defd5239584dbe

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index dbe923a..8195001 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -251,18 +251,13 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const 
char* pStr2 );
 
 #define SAL_FRAME_WNDEXTRA  sizeof( DWORD )
 #define SAL_FRAME_THIS  0
-#define SAL_FRAME_CLASSNAMEA"SALFRAME"
 #define SAL_FRAME_CLASSNAMEWL"SALFRAME"
-#define SAL_SUBFRAME_CLASSNAMEA "SALSUBFRAME"
 #define SAL_SUBFRAME_CLASSNAMEW L"SALSUBFRAME"
 #define SAL_TMPSUBFRAME_CLASSNAMEW  L"SALTMPSUBFRAME"
 #define SAL_OBJECT_WNDEXTRA sizeof( DWORD )
 #define SAL_OBJECT_THIS 0
 #define SAL_OBJECT_CLASSNAMEA   "SALOBJECT"
-#define SAL_OBJECT_CLASSNAMEW   L"SALOBJECT"
 #define SAL_OBJECT_CHILDCLASSNAMEA  "SALOBJECTCHILD"
-#define SAL_OBJECT_CHILDCLASSNAMEW  L"SALOBJECTCHILD"
-#define SAL_COM_CLASSNAMEA  "SALCOMWND"
 #define SAL_COM_CLASSNAMEW  L"SALCOMWND"
 
 #define SAL_MOUSELEAVE_TIMEOUT  300
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH][PUSHED] Remove non-functional Hide/ShowStatusText

[Thomas Arnhold]

Hi Caolán,

thanks for pointing this out :)

Pushed it to master: 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=da38cd454a7d32b92dbdd1dd0abdce27c4ee2327


I have some questions:

- what's the matter about sfx2/inc/sfx2/sfxcommands.h? A quick check did 
offer me that many of those defines are never used. Is it right to 
remove the unused ones?


- hrc files: There were some comments that number XY was removed, should 
I do this as well? I did this only at sw/source/ui/docvw/docvw.hrc 
because the numbers before and after were set.


- STR_DOC_LOADING and STR_CHAIN_OK were unused. They are represented in 
many po files. Is there an easier way to remove them or only per regex/sed?


Thomas

On 06/11/2012 05:26 PM, Caolán McNamara wrote:

On Sat, 2012-06-09 at 06:36 +0200, Thomas Arnhold wrote:

Hi,

these two methods don't do anything. So remove them and the calls
(core+binfilter).


Yeah, that seems to be the case alright.

This also suggests that you can remove SID_STATUSBARTEXT as well from
the appbas.cxx, sfxsids.hrc and sfx.sdi

C.




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Thomas Arnhold]

 sfx2/inc/sfx2/sfxcommands.h  |2 --
 sfx2/inc/sfx2/sfxsids.hrc|1 -
 sfx2/sdi/sfx.sdi |   27 ---
 sfx2/source/appl/appbas.cxx  |5 -
 sfx2/source/doc/doc.hrc  |1 -
 sfx2/source/doc/doc.src  |4 
 sw/source/ui/docvw/docvw.hrc |2 +-
 7 files changed, 1 insertion(+), 41 deletions(-)

New commits:
commit da38cd454a7d32b92dbdd1dd0abdce27c4ee2327
Author: Thomas Arnhold 
Date:   Mon Jun 11 22:05:04 2012 +0200

Remove unused InterceptChildWindowKeyDown: further cleanup

Change-Id: I497b18aff8e571dd5f028325c16a7292f4f80692

diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index 31109d5..ebb1da1 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -257,8 +257,6 @@
 #define CMD_SID_SHOWPOPUPS  ".uno:ShowPopups"
 #define CMD_SID_BASICIDE_SHOWSBX".uno:ShowSbx"
 #define CMD_SID_SOURCEVIEW  ".uno:SourceView"
-#define CMD_SID_STATUSBARTEXT   ".uno:StatusBar"
-#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible"
 #define CMD_SID_BASICIDE_STAT_DATE  ".uno:StatusGetDate"
 #define CMD_SID_BASICIDE_STAT_POS   ".uno:StatusGetPosition"
 #define CMD_SID_BASICIDE_STAT_TITLE ".uno:StatusGetTitle"
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 53fd3ee..c6a86f1 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -486,7 +486,6 @@
 #define SID_RESTOREWIN  (SID_SFX_START + 635)
 
 #define SID_CAPTION (SID_SFX_START + 641)
-#define SID_STATUSBARTEXT   (SID_SFX_START + 642)
 
 // id for thesaurs entry in context menu
 #define SID_THES(SID_SFX_START + 698)
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 396fbb7..e1dd418 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6084,33 +6084,6 @@ SfxBoolItem SourceView SID_SOURCEVIEW
 ]
 
 //--
-SfxStringItem StatusBar SID_STATUSBARTEXT
-
-[
-/* flags: */
-AutoUpdate = FALSE,
-Cachable = Cachable,
-FastCall = FALSE,
-HasCoreId = FALSE,
-HasDialog = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = TRUE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Synchron;
-
-Readonly = FALSE,
-
-/* config: */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = ;
-]
-
-//--
 SfxBoolItem StatusBarVisible SID_TOGGLESTATUSBAR
 
 [
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 1e79632..cc34ae2 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -248,11 +248,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 break;
 }
 
-case SID_STATUSBARTEXT:
-{
-break;
-}
-
 case SID_OFFICE_PRIVATE_USE:
 case SID_OFFICE_COMMERCIAL_USE:
 {
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index aca8a3a..dbff52d 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -101,7 +101,6 @@
 #define RID_STR_WARNSTYLEOVERWRITE  (RID_SFX_DOC_START+ 54)
 #define RID_DLSTATUS(RID_SFX_DOC_START+ 55)
 
-#define STR_DOC_LOADING (RID_SFX_DOC_START+ 57)
 #define MSG_OPEN_READONLY   (RID_SFX_DOC_START+ 58)
 
 #define RID_OFFICEFILTER(RID_SFX_DOC_START+ 59)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 4d99ae1..0222868 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -229,10 +229,6 @@ String RID_STR_WARNSTYLEOVERWRITE
 {
 Text [ en-US ] = "Should the \"$(ARG1)\" Style be replaced?" ;
 };
-String STR_DOC_LOADING
-{
-Text [ en-US ] = "Loading Document" ;
-};
 Resource RID_DLSTATUS
 {
 String INET_NAME_RESOLVE_START
diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc
index 305fb5b..bf75602 100644
--- a/sw/source/ui/docvw/docvw.hrc
+++ b/sw/source/ui/docvw/docvw.hrc
@@ -58,7 +58,7 @@
 
 
 #define STR_EXPORT_GRAFIK_TITLE (RC_DOCVW_BEGIN + 1)
-#define STR_CHAIN_OK(RC_DOCVW_BEGIN + 2)
+// FREE, was STR_CHAIN_OK
 #define STR_CHAIN_NOT_EMPTY (RC_DOCVW_BEGIN + 3)
 #define STR_CHAIN_IS_IN_CHAIN   (RC_DOCVW_BEGIN + 4)
 #define STR_CHAIN_WRONG_AREA(RC_DOCVW_BEGIN + 5)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)

[Bjoern Michaelsen]

On Mon, Jun 11, 2012 at 09:39:13PM +0200, David Ostrovsky wrote:
> fixed:
pushed.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.in

[Bjoern Michaelsen]

 configure.in |   31 ++-
 1 file changed, 18 insertions(+), 13 deletions(-)

New commits:
commit bbdb00c8c57a72f9bc730d3f7aab8a4d4acc6308
Author: David Ostrovsky 
Date:   Thu Jun 7 17:46:31 2012 -0700

disable mozilla per default on all platforms

Change-Id: Ie5e8c7c43d86f060d7733c1787c6382e78c0a463

diff --git a/configure.in b/configure.in
index fb4f3df..48bfd38 100644
--- a/configure.in
+++ b/configure.in
@@ -595,9 +595,9 @@ AC_ARG_ENABLE(pch,
 )
 
 AC_ARG_ENABLE(mozilla,
-AS_HELP_STRING([--disable-mozilla],
-[LibreOffice usually includes a strangely hacked up Mozilla binary for 
your
- platform, to build without this version, use this option.])
+AS_HELP_STRING([--enable-mozilla],
+[LibreOffice can include a strangely hacked up Mozilla binary for your
+ platform, to build with this version, use this option.])
 )
 
 AC_ARG_ENABLE(epm,
@@ -3611,6 +3611,21 @@ AC_SUBST(UPD)
 AC_SUBST(SOURCEVERSION)
 
 dnl ===
+dnl Set the WITH_MOZILLA variable.
+dnl ===
+
+AC_MSG_CHECKING([whether to enable build of Mozilla])
+if test "$enable_mozilla" = "yes"; then
+AC_MSG_RESULT([yes])
+WITH_MOZILLA=YES
+else
+AC_MSG_RESULT([no])
+WITH_MOZILLA=NO
+enable_mozilla=no
+fi
+AC_SUBST(WITH_MOZILLA)
+
+dnl ===
 dnl Set the ENABLE_CRASHDUMP variable.
 dnl ===
 AC_MSG_CHECKING([whether to enable crashdump feature])
@@ -7425,16 +7440,6 @@ else
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
-AC_MSG_CHECKING([whether to enable build of Mozilla])
-if test "$enable_mozilla" = "no"; then
-AC_MSG_RESULT([no])
-WITH_MOZILLA=NO
-else
-AC_MSG_RESULT([yes])
-WITH_MOZILLA=YES
-fi
-AC_SUBST(WITH_MOZILLA)
-
 AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
 if test "$enable_mozilla" = "no"; then
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] disable mozilla per default on all platforms (was Re: --disable mozilla necessary for Ubuntu)

[David Ostrovsky]

On 11.06.2012 11:44, Stephan Bergmann wrote:

On 06/08/2012 09:59 PM, David Ostrovsky wrote:

On 08.06.2012 12:52, Rene Engelhard wrote:

On Thu, Jun 07, 2012 at 09:01:31PM -0700, Joel Madero wrote:
It's been a long time since the default install has worked for me 
on any
Ubuntu or Ubuntu based distro. I always have to add 
--disable-mozilla in

Sane option. Anyone serious wants that. :)

no, not with this patch any more ;-)


I'm not sure we want this patch (see the other branch of this mail 
thread for fixing the build on Ubuntu instead).  But if we do apply 
it, we should also adapt
It is not (only) about compilation problems: the vast majority of LO 
folks out there (at least all serious guys, see Rene's comment above ;-) 
*use* this option anyway.
That why the invertion of logic here is more then justified. Not to 
mention the newbies and seasoned LO hackers, who were spendings hours to 
find the right option

to accelerate the LO build (or even get it done).



AC_ARG_ENABLE(mozilla,
AS_HELP_STRING([--disable-mozilla],
[LibreOffice usually includes a strangely hacked up Mozilla 
binary for your

 platform, to build without this version, use this option.])
)



fixed:

--enable-mozilla LibreOffice can include a strangely hacked up Mozilla 
binary for your platform, to build with this version, use this option.


Regards
David

>From 0af38a2d4d11a7745f8a3f7f8a4d6fed3267c49d Mon Sep 17 00:00:00 2001
From: David Ostrovsky 
Date: Thu, 7 Jun 2012 17:46:31 -0700
Subject: [PATCH] disable mozilla per default on all platforms

Change-Id: Ie5e8c7c43d86f060d7733c1787c6382e78c0a463
---
 configure.in |   31 ++-
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index fb4f3df..48bfd38 100644
--- a/configure.in
+++ b/configure.in
@@ -595,9 +595,9 @@ AC_ARG_ENABLE(pch,
 )
 
 AC_ARG_ENABLE(mozilla,
-AS_HELP_STRING([--disable-mozilla],
-[LibreOffice usually includes a strangely hacked up Mozilla binary for your
- platform, to build without this version, use this option.])
+AS_HELP_STRING([--enable-mozilla],
+[LibreOffice can include a strangely hacked up Mozilla binary for your
+ platform, to build with this version, use this option.])
 )
 
 AC_ARG_ENABLE(epm,
@@ -3611,6 +3611,21 @@ AC_SUBST(UPD)
 AC_SUBST(SOURCEVERSION)
 
 dnl ===
+dnl Set the WITH_MOZILLA variable.
+dnl ===
+
+AC_MSG_CHECKING([whether to enable build of Mozilla])
+if test "$enable_mozilla" = "yes"; then
+AC_MSG_RESULT([yes])
+WITH_MOZILLA=YES
+else
+AC_MSG_RESULT([no])
+WITH_MOZILLA=NO
+enable_mozilla=no
+fi
+AC_SUBST(WITH_MOZILLA)
+
+dnl ===
 dnl Set the ENABLE_CRASHDUMP variable.
 dnl ===
 AC_MSG_CHECKING([whether to enable crashdump feature])
@@ -7425,16 +7440,6 @@ else
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
-AC_MSG_CHECKING([whether to enable build of Mozilla])
-if test "$enable_mozilla" = "no"; then
-AC_MSG_RESULT([no])
-WITH_MOZILLA=NO
-else
-AC_MSG_RESULT([yes])
-WITH_MOZILLA=YES
-fi
-AC_SUBST(WITH_MOZILLA)
-
 AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
 if test "$enable_mozilla" = "no"; then
 AC_MSG_RESULT([no])
-- 
1.7.5.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW][3-5] fdo#38116, fdo#49438 fix double hairline border drawing some more

[Michael Stahl]

so it turns out that the fixes for fdo#48647 and fdo#49438 interact in a
bad way, and hence the border in the bugdoc on fdo#38116 is not
displayed; this is a regression in libreoffice-3-5.

let me lament about the fact that the people doing these 2 fixes have
_clearly_ not communicated well with each other :-/

[for that particular bugdoc, the border is only imported properly since
i backported vmiklos' fix 10 minutes ago, but it's a regression for
non-WW8 documents]

should be fixed with:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0044bd800b742f28056805bb163ff243cf4095f3

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - drawinglayer/source

[Michael Stahl]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 24076bea4fd290bd5f3babcb34a9a9b0831a0387
Author: Michael Stahl 
Date:   Mon Jun 11 20:19:32 2012 +0200

fdo#38116, fdo#49438: fix double hairline border drawing some more:

These two fixes interact in a bad way:
49bd0e4e6bb0ed0671de72d84700ddcc49828f69 (fdo#48647)
ee42895d684be9430a414adf3f569d279d437148 (fdo#49438)

The problem is that now hairline borders are detected properly, and the
double hairline borders are clipped to the right area, but the clipping
polygon actually collapses to a single line for the hairline border,
with the result that the clipped border line is an empty PolyPolygon
for e.g. a double border 3 twips wide.

Fix this by enforcing a minimum clipping polygon width of 2 units,
which seems to work nicely.

Change-Id: If9cf9f0ed6a5c837860c2313a84cd26b07734b03
(cherry picked from commit 0044bd800b742f28056805bb163ff243cf4095f3)

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 4591330..66fcfaf 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -89,8 +89,11 @@ namespace drawinglayer
 const basegfx::B2DVector 
aPerpendicular(basegfx::getPerpendicular(aVector));
 
 // Get the points
-const basegfx::B2DVector aLeftOff(aPerpendicular * (-0.5 * 
(getWidth(rViewInformation;
-const basegfx::B2DVector aRightOff(aPerpendicular * (0.5 * 
(getWidth(rViewInformation;
+const double fWidth(getWidth(rViewInformation));
+const basegfx::B2DVector aLeftOff(
+aPerpendicular * (-0.5 * std::max(fWidth, 1.0)));
+const basegfx::B2DVector aRightOff(
+aPerpendicular * (0.5 * std::max(fWidth, 1.0)));
 
 const basegfx::B2DVector aSLVector( aLeftOff - ( 
getExtendLeftStart() * aVector ) );
 clipPolygon.append( basegfx::B2DPoint( getStart() + aSLVector * 
2.0 ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: drawinglayer/source

[Michael Stahl]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 0044bd800b742f28056805bb163ff243cf4095f3
Author: Michael Stahl 
Date:   Mon Jun 11 20:19:32 2012 +0200

fdo#38116, fdo#49438: fix double hairline border drawing some more:

These two fixes interact in a bad way:
49bd0e4e6bb0ed0671de72d84700ddcc49828f69 (fdo#48647)
ee42895d684be9430a414adf3f569d279d437148 (fdo#49438)

The problem is that now hairline borders are detected properly, and the
double hairline borders are clipped to the right area, but the clipping
polygon actually collapses to a single line for the hairline border,
with the result that the clipped border line is an empty PolyPolygon
for e.g. a double border 3 twips wide.

Fix this by enforcing a minimum clipping polygon width of 2 units,
which seems to work nicely.

Change-Id: If9cf9f0ed6a5c837860c2313a84cd26b07734b03

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 4591330..66fcfaf 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -89,8 +89,11 @@ namespace drawinglayer
 const basegfx::B2DVector 
aPerpendicular(basegfx::getPerpendicular(aVector));
 
 // Get the points
-const basegfx::B2DVector aLeftOff(aPerpendicular * (-0.5 * 
(getWidth(rViewInformation;
-const basegfx::B2DVector aRightOff(aPerpendicular * (0.5 * 
(getWidth(rViewInformation;
+const double fWidth(getWidth(rViewInformation));
+const basegfx::B2DVector aLeftOff(
+aPerpendicular * (-0.5 * std::max(fWidth, 1.0)));
+const basegfx::B2DVector aRightOff(
+aPerpendicular * (0.5 * std::max(fWidth, 1.0)));
 
 const basegfx::B2DVector aSLVector( aLeftOff - ( 
getExtendLeftStart() * aVector ) );
 clipPolygon.append( basegfx::B2DPoint( getStart() + aSLVector * 
2.0 ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Michael Stahl]

 sw/source/filter/ww8/ww8graf.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0b8e6b2ba733719fc09dfe379b0d6b738723cdee
Author: Miklos Vajna 
Date:   Fri Apr 27 14:30:16 2012 +0200

n#757910 fix WW8 import of textboxes with thin border/inner margin

There were two problems here:

First, nLineThick was already in twips, so converting it again from EMU
rendered thin borders invisible.

Second, when the border width is set to zero, that means a minimal
border, but we interpreted it as default width (which resulted in less
space for the textbox contents than required).
(cherry picked from commit e652ba3c7357e0396498629891a1391ace67c4d7)

Signed-off-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7aec55a..5ac204b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1569,7 +1569,7 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 SvxBorderLine aLine;
 aLine.SetColor( rLineColor );
 
-aLine.SetWidth( long ( nLineThick / 65 ) ); // Convert EMUs to Twips
+aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is 
already in twips
 aLine.SetStyle( nIdx );
 
 for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
@@ -1626,7 +1626,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* 
pSdrObj,
 // Rahmen-GROESSE benoetigt!
 SvxBoxItem aBox(sw::util::ItemGet(rFlySet, RES_BOX));
 // dashed oder solid wird zu solid
-sal_Int32 nLineThick = 0, nOutside=0;
+// WW-default: 0.75 pt = 15 twips
+sal_Int32 nLineThick = 15, nOutside=0;
 
 // check if LineStyle is *really* set!
 const SfxPoolItem* pItem;
@@ -1641,7 +1642,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* 
pSdrObj,
 nLineThick = WW8ITEMVALUE(rOldSet, XATTR_LINEWIDTH, XLineWidthItem);
 
 if( !nLineThick )
-nLineThick = 15; // WW-default: 0.75 pt
+nLineThick = 1; // for Writer, zero is "no border", so set a 
minimal value
 
 nOutside = MatchSdrBoxIntoFlyBoxItem(aLineColor, eLineStyle,
 eDashing, eShapeType, nLineThick, aBox);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Roman Eisele  changed:

   What|Removed |Added

   Severity|major   |critical
   Priority|medium  |highest

--- Comment #326 from Roman Eisele  2012-06-11 10:12:02 PDT ---
(Reset Importance pickers after accidental change.)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk config_host.mk.s

[Petr Mladek]

 bin/distro-install-clean-up|2 +-
 bin/distro-install-desktop-integration |2 +-
 bin/distro-install-file-lists  |2 +-
 bin/distro-install-sdk |2 +-
 config_host.mk.source  |   10 ++
 sysui/desktop/productversion.mk|4 +++-
 6 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit e72ef0071c9a50e59a7241e6dbc4a969195542ec
Author: Petr Mladek 
Date:   Mon Jun 11 18:20:23 2012 +0200

new script config_host.mk.source

it allows to source variables from config_host.mk into shell;
there are many different hacks for this on other locations

Use this script in bin/distro-install-*; The original solution
with 'eval' did not work because shell was not able to pass
that many arguments

Change-Id: I3d9eb2fe2d6804a3c7783487e9c70f093edb2ad5

diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 54dd1f3..170ceb9 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index c7f58ee..3727f83 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index de3b859..98b3d80 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index f1cb6fe..7184f35 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/config_host.mk.source b/config_host.mk.source
new file mode 100644
index 000..042ffa2
--- /dev/null
+++ b/config_host.mk.source
@@ -0,0 +1,10 @@
+# this script allows to correctly source config_host.mk into existing shell
+#
+# Usage:
+#
+#   source ./config_host.mk.source
+
+temp_conf=`mktemp config_host.mk.XX`
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf
+source $temp_conf
+rm $temp_conf
commit 1a77fb9399a293aaf489c3072af38ec0c08429e9
Author: Petr Mladek 
Date:   Mon Jun 11 18:16:08 2012 +0200

correctly set icon names in desktop files

config_host.mk defines even empty UNIXWRAPPERNAME variable now.
Hence, 'UNIXWRAPPERNAME *=' newer assign the default value.

Change-Id: I2c782bdf79eddffa2451c5462106519479db7431

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 5a186bc..51dbfdb 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -57,7 +57,9 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
 # the default values get replaced by make_installer.pl at (core0x) packaging 
time;
 # another wrapper name can be forced by --with-unix-wrapper configure option
 # which is need by other distributors, see 
http://www.openoffice.org/issues/show_bug.cgi?id=75366
-UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.IF "$(UNIXWRAPPERNAME)" == ""
+UNIXWRAPPERNAME = '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.ENDIF
 
 PRODUCTNAME.libreoffice = LibreOffice
 PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk config_host.mk.source sysui/desktop

[Petr Mladek]

 bin/distro-install-clean-up|2 +-
 bin/distro-install-desktop-integration |2 +-
 bin/distro-install-file-lists  |2 +-
 bin/distro-install-sdk |2 +-
 config_host.mk.source  |   10 ++
 sysui/desktop/productversion.mk|4 +++-
 6 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 277b7fd3a483351368604ef2b71fb5ff44801e8b
Author: Petr Mladek 
Date:   Mon Jun 11 18:20:23 2012 +0200

new script config_host.mk.source

it allows to source variables from config_host.mk into shell;
there are many different hacks for this on other locations

Use this script in bin/distro-install-*; The original solution
with 'eval' did not work because shell was not able to pass
that many arguments

Change-Id: I3d9eb2fe2d6804a3c7783487e9c70f093edb2ad5

diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 54dd1f3..170ceb9 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index c7f58ee..3727f83 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index de3b859..98b3d80 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index f1cb6fe..7184f35 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if test -z "${SRC_ROOT}"; then
-eval $(sed -e s/\'/\'\'\'/g -e 's/=\(.\+\)/='\''\1'\'/ 
./config_host.mk)
+source ./config_host.mk.source
 fi
 if test -z "${SOLARENV}"; then
 echo "distro-install-clean-up: No environment set!"
diff --git a/config_host.mk.source b/config_host.mk.source
new file mode 100644
index 000..042ffa2
--- /dev/null
+++ b/config_host.mk.source
@@ -0,0 +1,10 @@
+# this script allows to correctly source config_host.mk into existing shell
+#
+# Usage:
+#
+#   source ./config_host.mk.source
+
+temp_conf=`mktemp config_host.mk.XX`
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf
+source $temp_conf
+rm $temp_conf
commit 525bd17ff257863226119e310fa69791aeb59d8a
Author: Petr Mladek 
Date:   Mon Jun 11 18:16:08 2012 +0200

correctly set icon names in desktop files

config_host.mk defines even empty UNIXWRAPPERNAME variable now.
Hence, 'UNIXWRAPPERNAME *=' newer assign the default value.

Change-Id: I2c782bdf79eddffa2451c5462106519479db7431

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 5a186bc..51dbfdb 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -57,7 +57,9 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
 # the default values get replaced by make_installer.pl at (core0x) packaging 
time;
 # another wrapper name can be forced by --with-unix-wrapper configure option
 # which is need by other distributors, see 
http://www.openoffice.org/issues/show_bug.cgi?id=75366
-UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.IF "$(UNIXWRAPPERNAME)" == ""
+UNIXWRAPPERNAME = '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
+.ENDIF
 
 PRODUCTNAME.libreoffice = LibreOffice
 PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Copyright (was: Re: How to change zoom from sfx2 appserv?)

[Michael Meeks]

Hi Matteo,

On Fri, 2012-06-08 at 15:59 +0200, Matteo Casalin wrote:
> a possibly silly question, but I'm wondering why new code files 
> (e.g. sfx2/inc/sfx2/zoomitem.hxx) say:

If it is based on previous code - then we need to retain that header.
If it is entirely new, we should use the new template :-)

HTH,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx  |3 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|   15 +++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 3c5a75208b41239b2e840a2ea9932a9f5b872b36
Author: Miklos Vajna 
Date:   Mon Jun 11 11:19:19 2012 +0200

fdo#49659 three RTF fixes

1) fix RTF import of pictures with inner groups

One would think that with {\pict{\foo1}}, the inner group has no effect
in the outer group, but this turns out to be valid, so we should handle
it as well.

(cherry picked from commit c5c3ce5e625a31d78a21fbbc339ee30ba99f3044)

2) handle RTF import of tables at the very end of the document

If the documents ends with a table, both Word/Writer produces a
non-table empty paragraph after that table. However, it's valid not to
emit that empty paragraph, so handle the situation in the importer.

(cherry picked from commit e08ab74b918be1473d91ed234ee7870cab137c7e)

3) dmapper: handle tables in substreams

(cherry picked from commit 61ba6e49f5bbadaf1334ce71459647c3d0a3a37d)

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5c45373..9f3d115 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3491,6 +3491,9 @@ void DomainMapper::lcl_table(Id name, 
writerfilter::Reference::Pointer_t
 void DomainMapper::lcl_substream(Id rName, 
::writerfilter::Reference::Pointer_t ref)
 {
 m_pImpl->appendTableManager( );
+// Appending a TableManager resets its TableHandler, so we need to append
+// that as well, or tables won't be imported properly in headers/footers.
+m_pImpl->appendTableHandler( );
 m_pImpl->getTableManager().startLevel();
 
 //import of page header/footer
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 08e189b..546613a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -216,9 +216,9 @@ DomainMapper_Impl::DomainMapper_Impl(
 
 //todo: does it make sense to set the body text as static text interface?
 uno::Reference< text::XTextAppendAndConvert > xBodyTextAppendAndConvert( 
m_xBodyText, uno::UNO_QUERY );
-TableDataHandler_t::Pointer_t pTableHandler
+m_pTableHandler.reset
 (new DomainMapperTableHandler(xBodyTextAppendAndConvert, *this));
-getTableManager( ).setHandler(pTableHandler);
+getTableManager( ).setHandler(m_pTableHandler);
 
 getTableManager( ).startLevel();
 m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( uno::Reference< 
lang::XMultiServiceFactory >( m_xComponentContext->getServiceManager(), 
uno::UNO_QUERY ) );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 1dc1ebc..07f6934 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -311,6 +311,7 @@ private:
 
 // TableManagers are stacked: one for each stream to avoid any confusion
 std::stack< boost::shared_ptr< DomainMapperTableManager > > 
m_aTableManagers;
+TableDataHandler_t::Pointer_t m_pTableHandler;
 
 //each context needs a stack of currently used attributes
 FIB m_aFIB;
@@ -556,6 +557,12 @@ public:
 m_aTableManagers.push( pMngr );
 }
 
+void appendTableHandler( )
+{
+if (m_pTableHandler.get())
+m_aTableManagers.top()->setHandler(m_pTableHandler);
+}
+
 void popTableManager( )
 {
 if ( m_aTableManagers.size( ) > 0 )
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3acbddc..a01e08d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -249,6 +249,7 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_bNeedPap(true),
 m_bNeedCr(false),
 m_bNeedPar(true),
+m_bNeedFinalPar(false),
 m_aListTableSprms(),
 m_aSettingsTableAttributes(),
 m_aSettingsTableSprms(),
@@ -481,6 +482,12 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
 // If there is no paragraph in this section, then insert a dummy one, as 
required by Writer
 if (m_bNeedPar)
 dispatchSymbol(RTF_PAR);
+// It's allowed to not have a non-table paragraph at the end of an RTF 
doc, add it now if required.
+if (m_bNeedFinalPar && bFinal)
+{
+dispatchFlag(RTF_PARD);
+dispatchSymbol(RTF_PAR);
+}
 while (m_nHeaderFooterPositions.size())
 {
 std::pair aPai

Re: [REVIEW] fdo#43989 first launch terminates after splash

[Stephan Bergmann]

On 06/11/2012 05:47 PM, Korrawit Pruegsanusak wrote:

I'd like to propose Stephan's patch into stable branch:

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=55836370ffb70a34b888f81cdacdfede8fee29cf
This fixed fdo#43989, which is 3.5 MAB, but we already have Andras'
8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da backported, so I'm not sure
whether we should have Stephan's patch backported too.

Also, from the commit message, Stephan committed new fix for
bnc#524250 at b5ad981518f4407243f89507b2561dd0b1ef28ee. Should this
patch backported as well?


From #libreoffice-dev backlogs:


Jun 07 11:22:35timar, tml_, I'm unsure whether we want 
55836370ffb70a34b888f81cdacdfede8fee29cf (and maybe b5ad981518f4407243f89507b2561dd0b1ef28ee, 
too) in -3-6 or even -3-5; without them, we'll keep the behavior on Windows that there is no 
automatic restart (is this by now considered a feature, or rather a bug?) but also that LO only 
starts upon second attempt "sporadically" (i.e., when syncing with bundled/shared 
extensions needs to be done, after
Jun 07 11:22:35those have changed in some way)
Jun 07 11:22:37no match found - might try 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=55836370ffb70a34b888f81cdacdfede8fee29cf
 in a couple of minutes
Jun 07 11:23:03s/no automatic restart/no automatic restart *after 
crash*/
Jun 07 11:42:46sberg: and what about, if we restarted only after 
E_NORMAL_RESTART, and not after crash?
Jun 07 11:49:06timar, one could fiddle something like that into -3-6 
etc., sure; but I would keep it simple -- either backport wholesale, or live with the 
current situation on -3-6 etc., which should be ~ok after your fix for fdo#43989
Jun 07 11:49:10LibreOffice-UI normal/medium RESOLVED FIXED After 
installation first launch terminates after splash screen 
https://bugs.freedesktop.org/show_bug.cgi?id=43989


My take is that b5ad981518f4407243f89507b2561dd0b1ef28ee isn't entirely 
trivial (there is that curious distinction between bExistsRecoveryData 
and bExistsSessionData in that code...), but backporting 
55836370ffb70a34b888f81cdacdfede8fee29cf without 
b5ad981518f4407243f89507b2561dd0b1ef28ee wouldn't be ideal, either.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: regcomp under windows, registering components

[Olivier Hallot]

Hello Michael

2012/6/11 Michael Meeks 

>
>
>
>You want to get rid of the extension manager GUI ? or you want a
> separate, stand-alone "extension manager" GUI ? :-) or you want to make
> it easier to edit the services.rdb ?
>
>
Yes, I want to prevent users to install extensions too easily..., so I
thought on having deploymentgui.dll as a installable (optional) module.

For the moment, I will have to manage this by editing the xml.



>Ultimately the services.rdb doesn't have to be crunched like that it
> can be verbose and more human editable if you like that, but prolly
> worth avoiding that for the default install.
>

Agree.

-- 
Olivier Hallot
Founder and Steering Commitee Member
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/qa

[Miklos Vajna]

 sw/qa/extras/rtftok/data/fdo49659.rtf |   19 +++
 sw/qa/extras/rtftok/rtftok.cxx|   23 +++
 2 files changed, 42 insertions(+)

New commits:
commit 26f4f5b94a7573132c456a302cdb92bc265541ab
Author: Miklos Vajna 
Date:   Mon Jun 11 17:55:21 2012 +0200

fdo#49659 testcase

Change-Id: Ie9bb39713e485d5fb4eb93c718796a0bbd083481

diff --git a/sw/qa/extras/rtftok/data/fdo49659.rtf 
b/sw/qa/extras/rtftok/data/fdo49659.rtf
new file mode 100644
index 000..c908826
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo49659.rtf
@@ -0,0 +1,19 @@
+{\rtf1
+\sectd
+{\header
+{\trowd\cellx4000\cellx9500\pard\plain\intbl
+{\pict{\pngblip\picwgoal2340\pichgoal1000\picscalex50\picscaley50\piccropl0\piccropr0\piccropt0\piccropb0}89504e470d0a1a0a000d4948445200750032014a22a9c5009249444154789c63fccf800c7e3231a00216065dd33fc10f155b2c52
+5905fdf303d1e547f9a37c6af219d1d2230b03c3df94f4d058bfeb9785e63c6060606260f87be4b4ee8ad3559ff90da0fa2518db2412db1812a0e631ff3539ef
+f08581e10b030303030b030333c399957baf21ecfbf5eb3fafc3110686170c0c0c0c0cff293ec6a1c0c420785efe1fe8f60300fbbc2d919818ba7900
+0049454e44ae426082}
+header1
+\cell\pard\plain\intbl
+header2
+\cell\row}
+}
+{\trowd\cellx4000\cellx9500\pard\plain\intbl
+body1
+\cell\pard\plain\intbl
+body2
+\cell\row}
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 2555fb5..e1f4fa7 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -28,6 +28,7 @@
 #include "../swmodeltestbase.hxx"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -95,6 +96,7 @@ public:
 void testFdo45190();
 void testFdo50539();
 void testFdo50665();
+void testFdo49659();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -133,6 +135,7 @@ public:
 CPPUNIT_TEST(testFdo45190);
 CPPUNIT_TEST(testFdo50539);
 CPPUNIT_TEST(testFdo50665);
+CPPUNIT_TEST(testFdo49659);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -781,6 +784,26 @@ void Test::testFdo50665()
 CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue);
 }
 
+void Test::testFdo49659()
+{
+load("fdo49659.rtf");
+
+// Both tables were ignored: 1) was in the header, 2) was ignored due to 
missing empty par at the end of the doc
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+
+// The graphic was also empty
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference xPropertySet(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xGraphic;
+xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+sal_Int8 nValue = 0;
+xGraphic->getPropertyValue("GraphicType") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, nValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW] fdo#43989 first launch terminates after splash

[Korrawit Pruegsanusak]

Hello Stephan, all,

I'd like to propose Stephan's patch into stable branch:

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=55836370ffb70a34b888f81cdacdfede8fee29cf
This fixed fdo#43989, which is 3.5 MAB, but we already have Andras'
8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da backported, so I'm not sure
whether we should have Stephan's patch backported too.

Also, from the commit message, Stephan committed new fix for
bnc#524250 at b5ad981518f4407243f89507b2561dd0b1ef28ee. Should this
patch backported as well?

These two patches, if appropriate, should go to both -3-5 and -3-6 branches.

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Using same User Profile with various users and / or LibO Versions

[Stephan Bergmann]

[putting libreoffice ML back on cc]

On 06/11/2012 05:18 PM, Rainer Bielefeld wrote:

The facts you mentioned cause some problems for me: I often try various
Versions to find out where the Bug appeared, some of them intended with
the same profile to unify test conditions. I do not believe that it will
be a hard restriction to use all versions with their own profile, but
you never know ...


In practice, this will likely work just fine most of the time, I assume.


An other problem I see if someone decides to downgrade. Do we have to
recommend to do a backup of the existing User Profile before an update
because there might be problems after the downgrade?


* If users do not force the user profile to a non-default location, LO 
should largely be able to handle a downgrade just fine.


** If the relevant versions use different default user profile 
locations, nothing bad can happen.  (Just note that once a given user 
profile has been marked as migrated, it will not be used for migration 
again.  So any changes the user makes to the downgraded version's user 
profile will be "lost" should the user later upgrade again.)


** If the relevant versions use the same default user profile location, 
there *is* a chance that data stored there has changed in a 
forward-compatible but not backward-compatible way.  (I doubt anybody 
takes care to prevent that; or am I mistaken?)  In such a case, it might 
indeed be advisable to make a backup prior to downgrade.


* If a user explicitly forces the user profile to a non-default location 
and reuses it across the downgrade, then chances are things will not 
work as intended, and it is definitely advisable to make a backup (and 
even more advisable to not reuse in the first place).


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED] Remove unused InterceptChildWindowKeyDown

[Caolán McNamara]

On Sat, 2012-06-09 at 06:47 +0200, Thomas Arnhold wrote:
> Hi,
> 
> some further cleanup:
> 
> - InterceptChildWindowKeyDown never gets called
> - so mbInterceptChildWindowKeyDown doesn't get changed
> - at ImplInterceptChildWindowKeyDown
> a) ImplSendMessage() is never accessed
> b) always returns sal_False

Yup, that seems to be the case alright. Pushed to master. Callcatcher,
fwiw, doesn't report that InterceptChildWindowKeyDown is uncalled
because its a virtual and it ignores virtuals.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: vcl/aqua vcl/headless vcl/inc vcl/ios vcl/unx vcl/win

[Caolán McNamara]

 vcl/aqua/source/window/salobj.cxx |6 
 vcl/headless/svpdummies.cxx   |1 
 vcl/inc/aqua/salobj.h |1 
 vcl/inc/headless/svpdummies.hxx   |2 -
 vcl/inc/ios/salobj.h  |1 
 vcl/inc/salobj.hxx|2 -
 vcl/inc/unx/gtk/gtkobject.hxx |2 -
 vcl/inc/unx/salobj.h  |2 -
 vcl/inc/win/saldata.hxx   |1 
 vcl/inc/win/salobj.h  |2 -
 vcl/inc/window.h  |3 --
 vcl/ios/source/window/salobj.cxx  |6 
 vcl/unx/generic/window/salobj.cxx |6 
 vcl/unx/gtk/window/gtkobject.cxx  |4 ---
 vcl/win/source/app/salinst.cxx|   14 +++
 vcl/win/source/gdi/salprn.cxx |   15 
 vcl/win/source/window/salobj.cxx  |   46 --
 17 files changed, 10 insertions(+), 104 deletions(-)

New commits:
commit 4282865c517f8de814696fa75d0662aba73a4624
Author: Thomas Arnhold 
Date:   Sat Jun 9 06:43:18 2012 +0200

Remove unused InterceptChildWindowKeyDown

- InterceptChildWindowKeyDown never gets called
- so mbInterceptChildWindowKeyDown doesn't get changed
- at ImplInterceptChildWindowKeyDown
   a) ImplSendMessage() is never accessed
   b) always returns sal_False

Change-Id: I2dc84c88644d19c238064ab1b7dff0a24f90dc5d

diff --git a/vcl/aqua/source/window/salobj.cxx 
b/vcl/aqua/source/window/salobj.cxx
index 40ba2d5..a0f 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -212,10 +212,4 @@ const SystemEnvData* AquaSalObject::GetSystemData() const
 return &maSysData;
 }
 
-// ---
-
-void AquaSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 9ebf261..2d80332 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -51,7 +51,6 @@ void SvpSalObject::EndSetClipRegion() {}
 void SvpSalObject::SetPosSize( long, long, long, long ) {}
 void SvpSalObject::Show( sal_Bool ) {}
 const SystemEnvData* SvpSalObject::GetSystemData() const { return 
&m_aSystemChildData; }
-void SvpSalObject::InterceptChildWindowKeyDown( sal_Bool ) {}
 
 // SalI18NImeStatus
 SvpImeStatus::~SvpImeStatus() {}
diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/aqua/salobj.h
index 2931ca0..490acd8 100644
--- a/vcl/inc/aqua/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -77,7 +77,6 @@ public:
 virtual voidSetPosSize( long nX, long nY, long nWidth, 
long nHeight );
 virtual voidShow( sal_Bool bVisible );
 virtual const SystemEnvData*GetSystemData() const;
-virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 0fc437e..9e3f4c9 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -55,8 +55,6 @@ public:
 virtual voidShow( sal_Bool bVisible );
 
 virtual const SystemEnvData*GetSystemData() const;
-
-virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 class SvpImeStatus : public SalI18NImeStatus
diff --git a/vcl/inc/ios/salobj.h b/vcl/inc/ios/salobj.h
index 751131f..a93f851 100644
--- a/vcl/inc/ios/salobj.h
+++ b/vcl/inc/ios/salobj.h
@@ -74,7 +74,6 @@ public:
 virtual voidSetPosSize( long nX, long nY, long nWidth, 
long nHeight );
 virtual voidShow( sal_Bool bVisible );
 virtual const SystemEnvData*GetSystemData() const;
-virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index df0e4cb..7aa453f 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -76,8 +76,6 @@ public:
 
 virtual const SystemEnvData*GetSystemData() const = 0;
 
-virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ) = 0;
-
 voidSetCallback( void* pInst, SALOBJECTPROC pProc )
 { m_pInst = pInst; m_pCallback = pProc; }
 longCallCallback( sal_uInt16 nEvent, const void* 
pEvent )
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index b715bb1..03b19a8 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -65,8 +65,6 @@ public:
 virtual voidSetForwardKey( sal_Bool 
bEnable );
 
 virtual const SystemEnvData*GetSystemData() const;
-
-virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index e2cbc09..5afd686 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -95,8 +95,6 @@ public:
 virtual void   

[REVIEW] Muthu's patches for pptx import fixes

[Korrawit Pruegsanusak]

Hello Muthu, all,

I'd like to propose two Muthu's patches to include in stable branch as follow:

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=90352e5f1e50291960c944f9a1f44ab3e91d6503
This also fixed long-standing fdo#35372 and its duplicate fdo#37311,
although there is still a problem in fdo#46594, but it's an
improvement and I think it's better than nothing.
This should go to only -3-5 branch because it's pushed before -3-6 branching.

* 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=25dd603fe2044f35341fe0c6d0b632c9295a824e
This also fixed fdo#49806 and its duplicates fdo#49808 and fdo#50283.
Although official build didn't suffer from this bug, but daily builds
did.
This should go to -3-5 and -3-6 branch.

If I shouldn't do this proposal in the future, please feel free to tell. :-)

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED] Remove non-functional Hide/ShowStatusText

[Caolán McNamara]

On Sat, 2012-06-09 at 06:36 +0200, Thomas Arnhold wrote:
> Hi,
> 
> these two methods don't do anything. So remove them and the calls 
> (core+binfilter).

Yeah, that seems to be the case alright. 

This also suggests that you can remove SID_STATUSBARTEXT as well from
the appbas.cxx, sfxsids.hrc and sfx.sdi

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: binfilter/bf_sfx2

[Caolán McNamara]

 binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx |5 -
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx |5 -
 2 files changed, 10 deletions(-)

New commits:
commit d98aea938214dca1c23569eb23694a283b32ce48
Author: Thomas Arnhold 
Date:   Sat Jun 9 06:34:10 2012 +0200

Remove non-functional Hide/ShowStatusText

Change-Id: I2ac8827dbf22f858a855fc6642fc09fa3aedc5f1

diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx 
b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
index cd08a60..1ae3750 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
@@ -68,7 +68,6 @@ struct SfxProgress_Impl : public SfxCancellable
 BOOLbWaitMode;
 BOOLbAllowRescheduling;
 BOOLbRunning;
-BOOLbIsStatusText;
 
 SfxProgress*pActiveProgress;
 SfxObjectShellRef   xObjSh;
@@ -150,7 +149,6 @@ inline ULONG Get10ThSec()
 /*N*/   pImp->nMax = nRange;
 /*N*/   pImp->bLocked = FALSE;
 /*N*/   pImp->bWaitMode = bWait;
-/*N*/   pImp->bIsStatusText = FALSE;
 /*N*/   pImp->nCreate = Get10ThSec();
 /*N*/   pImp->nNextReschedule = pImp->nCreate;
 /*N*/   DBG( DbgOutf( "SfxProgress: created for '%s' at %luds",
@@ -178,9 +176,6 @@ inline ULONG Get10ThSec()
 /*N*/   Stop();
 /*N*/ if ( pImp->xStatusInd.is() )
 /*?*/ pImp->xStatusInd->end();
-/*N*/
-/*N*/   if( pImp->bIsStatusText == TRUE )
-/*?*/   GetpApp()->HideStatusText( );
 /*N*/   delete pImp;
 /*N*/ }
 
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx 
b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index f4f9483..fa4dd41 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -519,11 +519,6 @@ sal_False   Das Objekt konnte nicht geladen werden
 Broadcast( SfxSimpleHint(SFX_HINT_NAMECHANGED) );
 }
 
-if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode )
-{
-GetpApp()->HideStatusText();
-}
-
 return bOk;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/workben sfx2/inc sfx2/source sw/source vcl/inc vcl/source

[Caolán McNamara]

 extensions/workben/testframecontrol.cxx |7 ---
 sfx2/inc/sfx2/viewfrm.hxx   |3 ---
 sfx2/source/appl/appbas.cxx |6 --
 sfx2/source/bastyp/progress.cxx |6 --
 sfx2/source/doc/objstor.cxx |7 ---
 sfx2/source/view/viewfrm.cxx|   10 --
 sw/source/ui/docvw/edtwin.cxx   |6 --
 vcl/inc/vcl/svapp.hxx   |3 ---
 vcl/source/app/svapp.cxx|   12 
 9 files changed, 60 deletions(-)

New commits:
commit b3a3ab05e41a34c4a9d62639993f215dd47a2ae9
Author: Thomas Arnhold 
Date:   Sat Jun 9 06:32:31 2012 +0200

Remove non-functional Hide/ShowStatusText

Change-Id: Ifad680ea6f2f3693fecc649a000e638052dcf080

diff --git a/extensions/workben/testframecontrol.cxx 
b/extensions/workben/testframecontrol.cxx
index a4b715b..758738e 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -200,7 +200,6 @@ class FrameControlApplication
 {
 public:
 virtual voidMain();
-virtual voidShowStatusText( const XubString& rText );
 
 public:
 FrameControlApplication()   {}
@@ -308,10 +307,4 @@ void FrameControlApplication::Main()
 deinit();
 }
 
-//--
-void FrameControlApplication::ShowStatusText( const XubString& rStatus )
-{
-Application::GetAppWindow()->SetText( rStatus );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 18c8678..5cc3259 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -157,9 +157,6 @@ public:
 const ::com::sun::star::uno::Any & rValue );
 virtual ::sfx2::SvLinkSource*   DdeCreateLinkSource( const String& rItem );
 
-voidShowStatusText( const String& rText );
-voidHideStatusText();
-
 voidUpdateTitle();
 
 static void ActivateToolPanel( const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL 
);
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 0018663..1e79632 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -250,12 +250,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 
 case SID_STATUSBARTEXT:
 {
-SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, sal_False);
-String aText = pStringItem->GetValue();
-if ( aText.Len() )
-GetpApp()->ShowStatusText( aText );
-else
-GetpApp()->HideStatusText();
 break;
 }
 
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index f31b125..d48c8cd 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -68,7 +68,6 @@ struct SfxProgress_Impl
 sal_BoolbWaitMode;
 sal_BoolbAllowRescheduling;
 sal_BoolbRunning;
-sal_BoolbIsStatusText;
 
 SfxProgress*pActiveProgress;
 SfxObjectShellRef   xObjSh;
@@ -157,7 +156,6 @@ SfxProgress::SfxProgress
 pImp->nMax = nRange;
 pImp->bLocked = sal_False;
 pImp->bWaitMode = bWait;
-pImp->bIsStatusText = sal_False;
 pImp->nCreate = Get10ThSec();
 pImp->nNextReschedule = pImp->nCreate;
 DBG( DbgOutf( "SfxProgress: created for '%s' at %luds",
@@ -188,9 +186,6 @@ SfxProgress::~SfxProgress()
 Stop();
 if ( pImp->xStatusInd.is() )
 pImp->xStatusInd->end();
-
-if( pImp->bIsStatusText == sal_True )
-GetpApp()->HideStatusText( );
 delete pImp;
 }
 
@@ -256,7 +251,6 @@ long TimeOut_Impl( void*, void* pArgV )
 Timer *pArg = (Timer*)pArgV;
 if( Time::GetSystemTicks() - nLastTime > 3000 )
 {
-GetpApp()->HideStatusText();
 nLastTime = 0;
 delete pArg;
 }
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3700d57..3645e8a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -580,9 +580,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 {
 ModifyBlocker_Impl aBlock( this );
 
-if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode )
-GetpApp()->ShowStatusText( SfxResId(STR_DOC_LOADING) );
-
 pMedium = pMed;
 pMedium->CanDisposeStorage_Impl( sal_True );
 
@@ -805,8 +802,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 
 if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode )
 {
-GetpApp()->HideStatusText();
-
 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, 
SID_TEMPLATE, sal_False);
 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPreviewItem, Sfx

[BUILD] Permission issue with redland

[Regina Henschel]

Hi,

I have build on WinXP with MSVC 20008 from a fresh clone. Build breaks 
in redland with error:


if [ -f ../wntmsci12/misc/build/redland-1.0.8.exists ] ; then mv 
../wntmsci12/misc/build/redland-1.0.8 
../wntmsci12/misc/build/redland-1.0.8_removeme ; fi
mv: cannot move `../wntmsci12/misc/build/redland-1.0.8' to 
`../wntmsci12/misc/build/redland-1.0.8_removeme': Permission denied
dmake:  Error code 1, while making 
'../wntmsci12/misc/build/so_unpacked_so_redland'


I have set the protection on that folder to "no write protect" with 
Microsoft Explorer. I have repeated building then and it works fine then.


Kind regards
Regina


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Removed parts of PDFWriter and doTestCode method

[Stephan Bergmann]

On 06/10/2012 01:13 PM, Gökçen Eraslan wrote:

I have commented out outdated parts and added a
com::sun::star::uno::Reference<  com::sun::star::beans::XMaterialHolder>
to make it work. Patch is attached. In IRC, Tor said that writing a unit
test is a better way. Maybe I can write one.


I pushed the patch now, as 
 
"Make DO_TEST_PDF code work again."  (In the future, please provide 
patches created with "git format-patch" as they are easier to handle.)


For the functionality removed through cleanups, you can either leave it 
commented out for now, or---if it would be useful for your work---get 
the relevant functions back and wrap their declarations and definitions 
in #ifdef DO_TEST_PDF.


Replacing this "inline" test code with a unit test would surely be 
desirable.  However, I would consider that of minor importance for your 
GSoC project and would advise against spending any more time than 
necessary on this right now.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to compile "headless" LibreOffice on OpenSuse or Debian - asking for documentation

[Thomas Gries]

Am 11.06.2012 09:47, schrieb Riccardo Magliocchetti:
>
> For these two parts you can take a look at
> https://wiki.documentfoundation.org/Development/HeadlessBuild
>
>

thanks for pointing me to that page.
I will try this configure later. It looks to be exactly what I was
looking for.

However, this page is an "orphan" in your wiki see "What links here"
https://wiki.documentfoundation.org/Special:WhatLinksHere/Development/HeadlessBuild
and perhaps you want to fix this by linking to it from the parent page.

Tom






signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source

[Petr Mladek]

 sfx2/source/dialog/filedlghelper.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 15e3ecfcf24ff86290d3d24b456252afe17d5af1
Author: Petr Mladek 
Date:   Mon Jun 11 17:16:15 2012 +0200

fix sfx2/source/dialog/filedlghelper.cxx to compile again

related to the new string stuff

Change-Id: I628fe5c59fd9a6e3a98d0fab422a800ced6ca119

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index dc07d89..fa74ea5 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -100,8 +100,10 @@
 #include "filedlgimpl.hxx"
 #include 
 #include 
+#include 
 #include 
 #ifdef UNX
+#include 
 #include 
 #endif
 
@@ -1663,7 +1665,7 @@ void FileDialogHelper_Impl::verifyPath()
 }
 INetURLObject url(maPath);
 if (url.GetProtocol() != INET_PROT_FILE
-|| url.getName(0, true, INetURLObject::DECODE_WITH_CHARSET) != "tmp")
+|| !(url.getName(0, true, 
INetURLObject::DECODE_WITH_CHARSET)).equalsAscii("tmp"))
 {
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Stephan Bergmann]

 vcl/source/gdi/pdfwriter_impl.cxx |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 4eeaa94ae07f45f0e9f1f05c474fa75e955d4e70
Author: Gökçen Eraslan 
Date:   Mon Jun 11 17:18:10 2012 +0200

Make DO_TEST_PDF code work again

Change-Id: I3b3e5ab68421e25e6bf153f11ca5e538aa482874

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index df7d15e..9c1e6bb 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -135,7 +135,8 @@ void doTestCode()
 aContext.DocumentInfo.Title = OUString( "PDF export test document"  );
 aContext.DocumentInfo.Producer = OUString( "VCL"  );
 
-PDFWriter aWriter( aContext );
+com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > 
xEnc;
+PDFWriter aWriter( aContext, xEnc );
 aWriter.NewPage( 595, 842 );
 aWriter.BeginStructureElement( PDFWriter::Document );
 // set duration of 3 sec for first page
@@ -180,7 +181,7 @@ void doTestCode()
 aWriter.SetActualText( String( RTL_CONSTASCII_USTRINGPARAM( "It was the 
best of PDF, it was the worst of PDF ... or so. This is a pretty nonsensical 
text to denote a paragraph. I suggest you stop reading it. Because if you read 
on you might get bored. So continue on your on risk. Hey, you're still here ? 
Why do you continue to read this as it is of no use at all ? OK, it's your 
time, but still... . Woah, i even get bored writing this, so let's end this 
here and now." ) ) );
 aWriter.SetAlternateText( String( RTL_CONSTASCII_USTRINGPARAM( "This 
paragraph contains some lengthy nonsense to test structural element emission of 
PDFWriter." ) ) );
 aWriter.EndStructureElement();
-sal_Int32 nLongPara = aWriter.BeginStructureElement( PDFWriter::Paragraph 
);
+aWriter.BeginStructureElement( PDFWriter::Paragraph );
 aWriter.SetStructureAttribute( PDFWriter::WritingMode, PDFWriter::LrTb );
 aWriter.DrawText( Rectangle( Point( 4500, 19000 ), Size( 12000, 1000 ) ),
   String( RTL_CONSTASCII_USTRINGPARAM( "This paragraph is 
nothing special either but ends on the next page structurewise" ) ),
@@ -216,13 +217,19 @@ void doTestCode()
 sal_Int32 nFirstDest = aWriter.CreateDest( aTargetRect );
 // enable structure
 aWriter.EndStructureElement();
+
 // add something to the long paragraph as an afterthought
+/* PDFWriter::aWriter.GetCurrentStructureElement removed as an 
unusedcode.easy item:
+
http://cgit.freedesktop.org/libreoffice/core/commit/?id=09279fe3dad24ab58121e4f0a9564d252b64d81a
+
 sal_Int32 nSaveStruct = aWriter.GetCurrentStructureElement();
 aWriter.SetCurrentStructureElement( nLongPara );
 aWriter.DrawText( Rectangle( Point( 4500,4500 ),  Size( 12000, 1000 ) ),
   String( RTL_CONSTASCII_USTRINGPARAM( "Add something to 
the longish paragraph above." ) ),
   TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
 aWriter.SetCurrentStructureElement( nSaveStruct );
+*/
+
 aWriter.EndStructureElement();
 aWriter.EndStructureElement();
 aWriter.BeginStructureElement( PDFWriter::Figure );
@@ -288,6 +295,11 @@ void doTestCode()
 aTranspRect = Rectangle( Point( 1500, 16500 ), Size( 4800, 3000 ) );
 aWriter.SetFillColor( Color( COL_LIGHTRED ) );
 aWriter.DrawRect( aTranspRect );
+
+/*
+EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap& 
rAlphaMask ) is removed as an unusedcode.easy item:
+
http://cgit.freedesktop.org/libreoffice/core/commit/?id=581e7d7057afa87036d84e42c0e0a8a7368e20c7
+
 aWriter.BeginTransparencyGroup();
 aWriter.SetFillColor( Color( COL_LIGHTGREEN ) );
 aWriter.DrawEllipse( aTranspRect );
@@ -296,6 +308,7 @@ void doTestCode()
   String( RTL_CONSTASCII_USTRINGPARAM( "Some transparent 
text" ) ),
   TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | 
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
 aWriter.EndTransparencyGroup( aTranspRect, aTransMask );
+*/
 
 Bitmap aImageBmp( Size( 256, 256 ), 24 );
 pAcc = aImageBmp.AcquireWriteAccess();
@@ -333,6 +346,10 @@ void doTestCode()
 aWall.SetStyle( WALLPAPER_TILE );
 aWriter.DrawWallpaper( Rectangle( Point( 4400, 4200 ), Size( 10200, 6300 ) 
), aWall );
 
+/*
+BeginPattern/EndPattern is removed as an unusedcode.easy item:
+
http://cgit.freedesktop.org/libreoffice/core/commit/?id=581e7d7057afa87036d84e42c0e0a8a7368e20c7
+
 aWriter.Push( PUSH_ALL );
 aWriter.BeginPattern(Rectangle(Point(0,0),Size(2000,1000)));
 aWriter.SetFillColor( Color( COL_RED ) );
@@ -350,6 +367,7 @@ void doTestCode()
 aWriter.SetFillColor();
 aWriter.SetLineColor( Color( COL_LIGHTBLUE ) );
 aWriter.DrawRect( aPolyRect );
+*/
 
 aWriter.NewPage( 595, 842 );
 aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
___
Libreoffice-commits maili

Re: regcomp under windows, registering components

[Stephan Bergmann]

On 06/11/2012 04:55 PM, Olivier Hallot wrote:

Is there a tool to handle services.rdb, beside pure xml text edition?


Nothing besides (XML-aware) text editors.  regview etc. no longer work 
on it.  (Which I considered a minor problem when changing it, as the 
information is already textual now.  But of course, any scripts etc. 
built around it would now need to be adapted.)



How easy it is to have the extension manager GUI as a installable
module, or bundled optional extension? Is it something that can fit into
an easy hack? (I am seeking to clone the update manager feature as
starting point).


If you want to make the extension manager GUI into an optional module 
(so that, e.g., end users have no easy way to mess with it), that 
shouldn't be too difficult.  Things that come to mind:


* The code should mostly be separated into a deploymentgui dynamic 
library already (in module desktop).


* Hooks that call into that code are "Tools - Extension Manager..." and 
trying to open an .oxt file (e.g., passing it to LO on command line).


* It might be necessary to make the code for only update of extensions 
conditional on whether the GUI is available.


* There might be more...

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: regcomp under windows, registering components

[Michael Meeks]

Hi Olivier,

On Mon, 2012-06-11 at 11:55 -0300, Olivier Hallot wrote:
> It looks like services.rdb is now a xml file and
> regcomp/regview/regmerge cannot handle it anymore. Besides, this xml
> is a one-line file, so pretty hard to edit without unwindind it.

Yep; crunching the whitespace makes it faster to parse, but much harder
to edit.

> My 2 questions:
> Is there a tool to handle services.rdb, beside pure xml text edition?

I use  xmllint --format (from libxml2) to read it. We could of course
do some small XSLT-ness to have a newlines for each  - that
might make it easier to trivially remove components.

Adding new components is even easier - just drop a file in
program/services/ - and it will be parsed & incorporated on next start.

> How easy it is to have the extension manager GUI as a installable
> module, or bundled optional extension? Is it something that can fit
> into an easy hack? (I am seeking to clone the update manager feature
> as starting point).

You want to get rid of the extension manager GUI ? or you want a
separate, stand-alone "extension manager" GUI ? :-) or you want to make
it easier to edit the services.rdb ?

Ultimately the services.rdb doesn't have to be crunched like that it
can be verbose and more human editable if you like that, but prolly
worth avoiding that for the default install.

HTH,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-5][PUSHED 3-5] some toolbar-related problems

[Caolán McNamara]

On Sun, 2012-06-10 at 18:54 +0400, Ivan Timofeev wrote:
> And finally I realized that there is no IMPL_LINK_NOARG in 
> libreoffice-3-5, so the cherry-pick would not succeed.
> Attached all 3 patches, they are applicable now and no corrections 
> needed. For sure.

Fair enough, pushed the three to 3-5.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to compile "headless" LibreOffice on OpenSuse or Debian - asking for documentation

[Thomas Gries]

Am 11.06.2012 09:57, schrieb Tor Lillqvist:
>>> + i.e. without uneeded "Desktop" modules
> What exactly do you mean with "modules" here? It is a very vague word
> and can mean almost anything.
>
> --tml

without modules means ==>
without the need to install and configure with GUI / Desktop / X11 / X
Windows System / Tck/Tl modules



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - framework/inc framework/source vcl/source

[Caolán McNamara]

 framework/inc/uielement/toolbarmanager.hxx  |1 
 framework/source/uielement/addonstoolbarmanager.cxx |7 --
 framework/source/uielement/toolbarmanager.cxx   |   10 +++
 vcl/source/window/toolbox.cxx   |   62 ++--
 4 files changed, 48 insertions(+), 32 deletions(-)

New commits:
commit e9b63535e426068435d36fbe9a70817950a55ef3
Author: Ivan Timofeev 
Date:   Thu Jun 7 22:34:01 2012 +0400

fdo#35972: toolbarmanager must be aware of changes in SvtMiscOptions

(cherry picked from commit 1829efaf9f5d9af9d51b01d273c7b6c60970b05d)

Conflicts:

framework/source/uielement/toolbarmanager.cxx

Change-Id: Ie6e3036e83b5ea859e2c73df47629eb79791a52c

Signed-off-by: Caolán McNamara 

diff --git a/framework/inc/uielement/toolbarmanager.hxx 
b/framework/inc/uielement/toolbarmanager.hxx
index 2f8ad05..a18d84f 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -173,6 +173,7 @@ class ToolBarManager : public 
::com::sun::star::frame::XFrameActionListener
 DECL_LINK( Deactivate, ToolBox * );
 DECL_LINK( StateChanged, StateChangedType* );
 DECL_LINK( DataChanged, DataChangedEvent* );
+DECL_LINK( MiscOptionsChanged, void* );
 
 DECL_LINK( MenuButton, ToolBox * );
 DECL_LINK( MenuSelect, Menu * );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx 
b/framework/source/uielement/addonstoolbarmanager.cxx
index 1ea2388..dc886e8 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -215,6 +215,9 @@ void AddonsToolBarManager::RefreshImages()
 );
 }
 }
+m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : 
TOOLBOX_BUTTONSIZE_SMALL );
+::Size aSize = m_pToolBar->CalcWindowSizePixel();
+m_pToolBar->SetOutputSizePixel( aSize );
 }
 
 void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< 
PropertyValue > >& rAddonToolbar )
diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index df50488..74930d2 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -301,6 +301,8 @@ ToolBarManager::ToolBarManager( const Reference< 
XMultiServiceFactory >& rServic
 
 m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
 m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, 
AsyncUpdateControllersHdl ) );
+
+SvtMiscOptions().AddListenerLink( LINK( this, ToolBarManager, 
MiscOptionsChanged ) );
 }
 
 ToolBarManager::~ToolBarManager()
@@ -350,6 +352,8 @@ void ToolBarManager::Destroy()
 m_pToolBar->SetCommandHdl( aEmpty );
 
 m_pToolBar = 0;
+
+SvtMiscOptions().RemoveListenerLink( LINK( this, ToolBarManager, 
MiscOptionsChanged ) );
 }
 
 ToolBox* ToolBarManager::GetToolBar() const
@@ -2139,6 +2143,12 @@ IMPL_LINK( ToolBarManager, DataChanged, 
DataChangedEvent*, pDataChangedEvent  )
 return 1;
 }
 
+IMPL_LINK(ToolBarManager, MiscOptionsChanged, void*, EMPTYARG)
+{
+CheckAndUpdateImages();
+return 0;
+}
+
 IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG )
 {
 // The guard must be in its own context as the we can get destroyed when 
our
commit b29d04e9360920045cfa87f1e6263434915ae9a7
Author: Ivan Timofeev 
Date:   Sat Jun 9 21:23:46 2012 +0400

fdo#42379: hide separators before calculating line breaks

it is nesessary since commit 1703501a100cd6d52578baeb4e8097218b285ffb,
ImplCalcBreaks looks for the last visible item.
(cherry picked from commit 243fefb72897f45448d946d571397b7bc4893e7d)

Signed-off-by: Caolán McNamara 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9da3a7a..a055c6a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2336,6 +2336,38 @@ Size ToolBox::ImplGetOptimalFloatingSize( 
FloatingSizeMode eMode )
 return aCurrentSize;
 }
 
+namespace
+{
+static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems )
+{
+bool bLastSep( true );
+std::vector< ImplToolItem >::iterator it;
+for ( it = rItems.begin(); it != rItems.end(); ++it )
+{
+if ( it->meType == TOOLBOXITEM_SEPARATOR )
+{
+it->mbVisible = sal_False;
+if ( !bLastSep )
+{
+// check if any visible items have to appear behind it
+std::vector< ImplToolItem >::iterator temp_it;
+for ( temp_it = it+1; temp_it != rItems.end(); ++temp_it )
+{
+if ( ((temp_it->meType == TOOLBOXITEM_BUTTON) &&
+  temp_it->mbVisible) )
+{
+it->mbVisible = sal_True;
+break;
+}
+}
+  

[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx  |3 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 61ba6e49f5bbadaf1334ce71459647c3d0a3a37d
Author: Miklos Vajna 
Date:   Mon Jun 11 17:04:37 2012 +0200

fdo#49659 dmapper: handle tables in substreams

Change-Id: I4c81eb1ec57bda2b5ce65b19de998bab2dfb6c3c

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5c45373..9f3d115 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3491,6 +3491,9 @@ void DomainMapper::lcl_table(Id name, 
writerfilter::Reference::Pointer_t
 void DomainMapper::lcl_substream(Id rName, 
::writerfilter::Reference::Pointer_t ref)
 {
 m_pImpl->appendTableManager( );
+// Appending a TableManager resets its TableHandler, so we need to append
+// that as well, or tables won't be imported properly in headers/footers.
+m_pImpl->appendTableHandler( );
 m_pImpl->getTableManager().startLevel();
 
 //import of page header/footer
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 08e189b..546613a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -216,9 +216,9 @@ DomainMapper_Impl::DomainMapper_Impl(
 
 //todo: does it make sense to set the body text as static text interface?
 uno::Reference< text::XTextAppendAndConvert > xBodyTextAppendAndConvert( 
m_xBodyText, uno::UNO_QUERY );
-TableDataHandler_t::Pointer_t pTableHandler
+m_pTableHandler.reset
 (new DomainMapperTableHandler(xBodyTextAppendAndConvert, *this));
-getTableManager( ).setHandler(pTableHandler);
+getTableManager( ).setHandler(m_pTableHandler);
 
 getTableManager( ).startLevel();
 m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( uno::Reference< 
lang::XMultiServiceFactory >( m_xComponentContext->getServiceManager(), 
uno::UNO_QUERY ) );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 1dc1ebc..07f6934 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -311,6 +311,7 @@ private:
 
 // TableManagers are stacked: one for each stream to avoid any confusion
 std::stack< boost::shared_ptr< DomainMapperTableManager > > 
m_aTableManagers;
+TableDataHandler_t::Pointer_t m_pTableHandler;
 
 //each context needs a stack of currently used attributes
 FIB m_aFIB;
@@ -556,6 +557,12 @@ public:
 m_aTableManagers.push( pMngr );
 }
 
+void appendTableHandler( )
+{
+if (m_pTableHandler.get())
+m_aTableManagers.top()->setHandler(m_pTableHandler);
+}
+
 void popTableManager( )
 {
 if ( m_aTableManagers.size( ) > 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC 2012][Collaboration] status + screenshot

[Eike Rathke]

Hi Matúš,

On Saturday, 2012-06-09 19:10:22 +0200, Matúš Kukan wrote:

> Then I have removed pointless ScCollaboration class and now
> I am wondering how to init collaboration from Libreoffice
> and how to work only on one document.

Hopefully some quick ideas in the reply to your personal mail help.
And yes, let keep things on the ML now.

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpVW0Db2bm1t.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2

[Eike Rathke]

Hi Winfried,

On Friday, 2012-06-08 17:08:38 +0200, Winfried Donkers wrote:

> >Huh? Accidentally hit the delete line key in your editor?
> No, I did a git pull -r whilst working on the code and forgot to update this 
> file. Should have seen it, though.

Do you know about the git stash command? Seems that could solve such
steps in your workflow. See git stash --help


> >This does not work. Excel doesn't know the XOR function so there is no
> >function identifier available. Inventing a value like 355 also does not
> >work, the values have to be those that Excel uses. So, ...
> >... just leave the function in that section then at least Calc can use
> >it if the .xls is reopened.
> Here I couldn't check Excel and guessed (wrongly) that Excel would have an 
> XOR function.

Well, yes, but even if it did the correct function identifier would have
to be used, not an invented one. For the existing entries in those lists
I trust the original author that if an entry for binary file format
doesn't exist then Excel really doesn't know that ;-)


> All right. I created bug 50882 for the XOR function and will create
> other bug for other functions (I hope I entered the dependancy
> correct).

Yep, fine, also thanks for adding me on Cc.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpkkTJ4mMwy7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED 3-6][PUSHED 3-5] fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

[Caolán McNamara]

On Mon, 2012-06-11 at 16:43 +0200, Rene Engelhard wrote:
> On Sun, Jun 10, 2012 at 05:38:12PM +0200, Thomas Arnhold wrote:
> > Please could someone sign this for inclusion in libreoffice-3-5 and 3-6?
> > 
> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=2432083b50ea7481247c303187bb3922714f93d5
> 
> Cherry-picked to -3-6.
> 
> Signed-off from me for -3-5, too... I guess we need more reviews?

ah its trivial, pushed to 3-5.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Caolán McNamara]

 vcl/unx/generic/app/saldisp.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 23f5055cdec658d3cce1ddede8ea3e2d6a75c744
Author: Thomas Arnhold 
Date:   Sun Jun 10 17:36:05 2012 +0200

Remove bogus header

Thanks to Rene Engelhard for pointing this out.

Change-Id: I6a6c91f6675ec8034c0af85dcb89bcbfaa7a18d8
(cherry picked from commit 2432083b50ea7481247c303187bb3922714f93d5)

Signed-off-by: Caolán McNamara 

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index e2b05e2..ca7a73a 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -70,9 +70,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned 
char*, int*);
 
 #include 
 
-#include 
 #include 
-
 #include 
 #include 
 #include "unx/i18n_im.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: regcomp under windows, registering components

[Olivier Hallot]

Hi Stephan

It looks like services.rdb is now a xml file and regcomp/regview/regmerge
cannot handle it anymore. Besides, this xml is a one-line file, so pretty
hard to edit without unwindind it.

My 2 questions:

Is there a tool to handle services.rdb, beside pure xml text edition?

How easy it is to have the extension manager GUI as a installable module,
or bundled optional extension? Is it something that can fit into an easy
hack? (I am seeking to clone the update manager feature as starting point).

Thanks for the advise
Regards
Olivier



2012/6/5 Stephan Bergmann 

> On 06/04/2012 08:14 PM, Olivier Hallot wrote:
>
>> since LibreOffice 3.?, some of these libs moved elsewhere and dll's have
>> new names, specifically:
>>
>> what is now "deploymentguimi.uno.dll" ?
>>
>> (I have deployment.dll, deploymentgui.dll and deploymentmisclo.dll, so
>> which one?)
>>
>
> should be deploymentgui.dll now (for one, there was a move to replace
> per-platform suffixes like "mi" or "li" with a common "lo," and for
> another, during gbuild'ification some lib names got changed slightly, too).
>
>
>  \Basis\program\services.rdb
>>
>> seems to have moved to
>>
>> \program\services\services.**rdb,
>>
>> my best guess so far... Right?
>>
>
> Yes (for one, the three-layer layout got unwound again, so Basis is gone
> now, and for another, service rdbs were moved into a sub-directory of their
> own, program\services).
>
> Stephan
> __**_
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.**org 
> http://lists.freedesktop.org/**mailman/listinfo/libreoffice
>



-- 
Olivier Hallot
Founder and Steering Commitee Member
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] [Signing request] fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

[Rene Engelhard]

On Sun, Jun 10, 2012 at 05:38:12PM +0200, Thomas Arnhold wrote:
> Please could someone sign this for inclusion in libreoffice-3-5 and 3-6?
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=2432083b50ea7481247c303187bb3922714f93d5

Cherry-picked to -3-6.

Signed-off from me for -3-5, too... I guess we need more reviews?

Regards,

Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx

[René Engelhard]

 vcl/unx/generic/app/saldisp.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2036e842ccd906b5725eec3e66abb856a14e08b8
Author: Thomas Arnhold 
Date:   Sun Jun 10 17:36:05 2012 +0200

Remove bogus header

Thanks to Rene Engelhard for pointing this out.

Change-Id: I6a6c91f6675ec8034c0af85dcb89bcbfaa7a18d8

Signed-off-by: Rene Engelhard 

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 2c34fd0..90bdf83 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -66,9 +66,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned 
char*, int*);
 
 #include 
 
-#include 
 #include 
-
 #include 
 #include 
 #include "unx/i18n_im.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenSymbol license?

[Caolán McNamara]

On Fri, 2012-06-08 at 13:56 -0700, julien2412 wrote:
> Hello,
> 
> About Olivier and me, you'll find information here :
> http://wiki.documentfoundation.org/Development/Developers
> For the Sun part, I let "license experts" answer :-)

IMO the license for the OpenSymbol in Libreoffice is currently simply
LGPLv3.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5] fdo#50304 ( regression I guess )

[Eike Rathke]

Hi,

On Monday, 2012-06-11 12:23:41 +0200, Fridrich Strba wrote:

> +1 from me

Yup, seems good, thanks again.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpxNvISdnC0L.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: fdo#39641 - Clean up document type association on Linux

[Caolán McNamara]

On Sat, 2012-06-09 at 16:05 +0200, Rob Snelders wrote:
> HI All,
> 
> I wanted to look at this bug. But I wondered if the printeradmin still 
> is in the code and still works. Can anybody tell me the status of the 
> printer-admin-tool?

printeradmin must be the spadmin tool. That still exists and can be used
to do weird stuff like add a fax device. The
desktop/menus/printeradmin.desktop doesn't support any mime types though
so I don't think its strictly relevant to the goal of fdo#39641

C.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5] fix xlsx height import

[Eike Rathke]

Hi,

On Monday, 2012-06-11 12:06:25 +0200, Fridrich Strba wrote:

> The patch looks reasonable

Ok with me, thanks Noel and Fridrich.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpVNK5VrrDAy.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5] some shape position skew

[Eike Rathke]

Hi Fridrich,

On Monday, 2012-06-11 12:04:32 +0200, Fridrich Strba wrote:

> From the description, reverting is good :)

Well, we have drawbacks (short for drawing layer bugs? ;-) on either
side ... but it seems that Noel's analysis indicates that without those
changes behavior is better in more general cases. Thanks for pushing.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpBSL2BnHK5K.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 writerfilter/source/doctok/WW8ResourceModelImpl.cxx |2 -
 writerfilter/source/resourcemodel/resourcemodel.cxx |   32 ++--
 writerfilter/source/resourcemodel/resourcemodel.hxx |   11 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 00c23c39f512090cc70e975a27f3636d7b14f29c
Author: Miklos Vajna 
Date:   Mon Jun 11 16:26:35 2012 +0200

writerfilter/resourcemodel: don't use a global variable here

Change-Id: I064070a51cb87c10c72917b19969672d2121be7a

diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx 
b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 017fa66..7fea143 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -209,8 +209,6 @@ void WW8TableManager::endParagraphGroup()
 TableManager::endParagraphGroup();
 }
 
-WW8TableManager gTableManager;
-
 /* WW8StreamHandler */
 
 WW8StreamHandler::WW8StreamHandler()
@@ -218,12 +216,14 @@ WW8StreamHandler::WW8StreamHandler()
 {
 output.closeGroup();
 output.addItem("");
-gTableManager.startLevel();
+mpTableManager = new WW8TableManager;
+mpTableManager->startLevel();
 }
 
 WW8StreamHandler::~WW8StreamHandler()
 {
-gTableManager.endLevel();
+mpTableManager->endLevel();
+delete mpTableManager;
 
 output.closeGroup();
 output.addItem("");
@@ -244,13 +244,13 @@ void WW8StreamHandler::startParagraphGroup()
 output.openGroup();
 output.addItem("");
 
-gTableManager.startParagraphGroup();
-gTableManager.handle(gInfo);
+mpTableManager->startParagraphGroup();
+mpTableManager->handle(gInfo);
 }
 
 void WW8StreamHandler::endParagraphGroup()
 {
-gTableManager.endParagraphGroup();
+mpTableManager->endParagraphGroup();
 
 output.addItem("");
 output.closeGroup();
@@ -316,7 +316,7 @@ void WW8StreamHandler::text(const sal_uInt8 * data, size_t 
len)
 
 output.addItem(tmpStr);
 
-gTableManager.text(data, len);
+mpTableManager->text(data, len);
 }
 
 void WW8StreamHandler::utext(const sal_uInt8 * data, size_t len)
@@ -357,26 +357,26 @@ void WW8StreamHandler::utext(const sal_uInt8 * data, 
size_t len)
 
 output.addItem(tmpStr);
 
-gTableManager.utext(data, len);
+mpTableManager->utext(data, len);
 
 mnUTextCount++;
 }
 
 void WW8StreamHandler::props(writerfilter::Reference::Pointer_t 
ref)
 {
-WW8PropertiesHandler aHandler;
+WW8PropertiesHandler aHandler(mpTableManager);
 
 output.addItem("getType() + "\">");
 ref->resolve(aHandler);
 
-//gTableManager.props(ref);
+//mpTableManager->props(ref);
 
 output.addItem("");
 }
 
 void WW8StreamHandler::table(Id name, 
writerfilter::Reference::Pointer_t ref)
 {
-WW8TableHandler aHandler;
+WW8TableHandler aHandler(mpTableManager);
 
 output.addItem("");
@@ -399,11 +399,11 @@ void WW8StreamHandler::substream(Id name,
 output.addItem("");
 
-gTableManager.startLevel();
+mpTableManager->startLevel();
 
 ref->resolve(*this);
 
-gTableManager.endLevel();
+mpTableManager->endLevel();
 
 output.addItem("");
 }
@@ -525,7 +525,7 @@ void WW8PropertiesHandler::sprm(Sprm & sprm_)
 output.addItem("");
 }
 
-gTableManager.sprm(sprm_);
+mpTableManager->sprm(sprm_);
 
 output.addItem("");
 }
@@ -535,7 +535,7 @@ void WW8TableHandler::entry(int /*pos*/,
 {
 output.addItem("");
 
-WW8PropertiesHandler aHandler;
+WW8PropertiesHandler aHandler(mpTableManager);
 
 try
 {
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx 
b/writerfilter/source/resourcemodel/resourcemodel.hxx
index 02caa04..e050d45 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -28,9 +28,11 @@
 #include 
 
 namespace writerfilter {
+class WW8TableManager;
 class WW8StreamHandler : public Stream
 {
 int mnUTextCount;
+WW8TableManager* mpTableManager;
 
 public:
 WW8StreamHandler();
@@ -62,9 +64,11 @@ class WW8PropertiesHandler : public Properties
 typedef boost::shared_ptr SprmSharedPointer_t;
 typedef vector SprmPointers_t;
 SprmPointers_t sprms;
+WW8TableManager* mpTableManager;
 
 public:
-WW8PropertiesHandler()
+WW8PropertiesHandler(WW8TableManager* pTableManager)
+: mpTableManager(pTableManager)
 {
 }
 
@@ -96,8 +100,11 @@ public:
 
 class WW8TableHandler : public Table
 {
+WW8TableManager* mpTableManager;
+
 public:
-WW8TableHandler()
+WW8TableHandler(WW8TableManager* pTableManager)
+: mpTableManager(pTableManager)
 {
 }
 
commit ea8347d079b0d47c8f2be4b89e7ae806930e1d95
Author: Miklos Vajna 
Date:   Mon Jun 11 16:15:07 2012 +0200

writerfilter/doctok: unused global variable

Change-Id: I93c9c6e267270a07bd98ea408f0d6f78759265bb

diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx 
b/writerfilter/source/doctok/WW8ResourceMod

Re: Build Error

[Stephan Bergmann]

On 06/11/2012 08:23 AM, Rob Snelders wrote:

When i tried a build with debugging then I ran into the error as is in
the file build-error. The attached patch solved the error.


But that patch didn't solve the problem for me (GetFontFileName is 
declared to return rtl::OString* after all, but happens to remain 
undefined).  I fixed that now with 
 
"Adapt gcach_layout.cxx to SAL_INFO."


Thanks anyway,
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 vcl/generic/glyphs/gcach_ftyp.cxx   |5 -
 vcl/generic/glyphs/gcach_layout.cxx |   26 +++---
 vcl/inc/generic/glyphcache.hxx  |1 -
 3 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 776abbb83e867ac5336d9da2097d91ad8152ef55
Author: Stephan Bergmann 
Date:   Mon Jun 11 15:52:51 2012 +0200

Adapt gcach_layout.cxx to SAL_INFO

* ServerFont::GetFontFileName definition seems to inadvertently got lost 
with
  8e64e571f23f969590efbf7246c464c352d8b9ec "Merge FreetypeServerFont and
  ServerFont now its split out into unx"

* Likewise, ServerFont::GetFontFaceNumber is unused, so remove declaration 
(that
  also has no corresponding definition)

Change-Id: Ia8919d4248243c434c5cdbda548f5303a468f2d3

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 93935e6..7c4bc21 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -913,7 +913,10 @@ boost::shared_ptr 
ServerFont::GetFontOptions() const
 return mpFontOptions;
 }
 
-// ---
+const ::rtl::OString* ServerFont::GetFontFileName() const
+{
+return mpFontInfo->GetFontFileName();
+}
 
 bool ServerFont::TestFont() const
 {
diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 40c7a33..2e41c70 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -35,10 +35,6 @@
 #include 
 
 #include 
-
-#if OSL_DEBUG_LEVEL > 1
-#include 
-#endif
 #include 
 
 namespace { struct SimpleLayoutEngine : public rtl::Static< 
ServerFontLayoutEngine, SimpleLayoutEngine > {}; }
@@ -231,12 +227,11 @@ const void* IcuFontFromServerFont::getFontTable( LETag 
nICUTableTag ) const
 
 sal_uLong nLength;
 const unsigned char* pBuffer = mrServerFont.GetTable( pTagName, &nLength );
-#if OSL_DEBUG_LEVEL > 1
-fprintf(stderr,"IcuGetTable(\"%s\") => %p\n", pTagName, pBuffer);
-int mnHeight = mrServerFont.GetFontSelData().mnHeight;
-const char* pName = mrServerFont.GetFontFileName()->getStr();
-fprintf(stderr,"font( h=%d, \"%s\" )\n", mnHeight, pName );
-#endif
+SAL_INFO("vcl", "IcuGetTable(\"" << pTagName << "\") => " << pBuffer);
+SAL_INFO(
+"vcl",
+"font( h=" << mrServerFont.GetFontSelData().mnHeight << ", \""
+<< mrServerFont.GetFontFileName()->getStr() << "\" )");
 return (const void*)pBuffer;
 }
 
@@ -336,17 +331,10 @@ void IcuFontFromServerFont::getGlyphAdvance( LEGlyphID 
nGlyphIndex,
 // ---
 
 le_bool IcuFontFromServerFont::getGlyphPoint( LEGlyphID,
-le_int32
-#if OSL_DEBUG_LEVEL > 1
-pointNumber
-#endif
-,
-LEPoint& ) const
+le_int32 pointNumber, LEPoint& ) const
 {
 //TODO: replace dummy implementation
-#if OSL_DEBUG_LEVEL > 1
-fprintf(stderr,"getGlyphPoint(%d)\n", pointNumber );
-#endif
+SAL_INFO("vcl", "getGlyphPoint(" << pointNumber << ")");
 return false;
 }
 
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 4b3286f..90551a6 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -192,7 +192,6 @@ public:
 virtual ~ServerFont();
 
 const ::rtl::OString* GetFontFileName() const;
-int GetFontFaceNumber() const;
 boolTestFont() const;
 FT_Face GetFtFace() const;
 int GetLoadFlags() const { return (mnLoadFlags & 
~FT_LOAD_IGNORE_TRANSFORM); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - libcdr/libcdr-0.0.8-msc.patch libcdr/makefile.mk

[Fridrich Strba]

 libcdr/libcdr-0.0.8-msc.patch |   10 ++
 libcdr/makefile.mk|2 ++
 2 files changed, 12 insertions(+)

New commits:
commit 66c2a6017f1e2e2fdf4e5f064b33d48327c1efcb
Author: Stephan Bergmann 
Date:   Mon Jun 11 15:17:04 2012 +0200

MSC fix

Change-Id: I12c8ab5779d952eb640298478da7084b5f643568
Signed-off-by: Fridrich Å trba 

diff --git a/libcdr/libcdr-0.0.8-msc.patch b/libcdr/libcdr-0.0.8-msc.patch
new file mode 100644
index 000..6a44e7d
--- /dev/null
+++ b/libcdr/libcdr-0.0.8-msc.patch
@@ -0,0 +1,10 @@
+--- misc/libcdr-0.0.8/src/lib/libcdr_utils.h   2012-06-06 13:42:03.0 
+0200
 misc/build/libcdr-0.0.8/src/lib/libcdr_utils.h 2012-06-11 
15:09:43.305289500 +0200
+@@ -50,6 +50,7 @@
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ typedef unsigned uint32_t;
++typedef short int16_t;
+ typedef int int32_t;
+ typedef unsigned __int64 uint64_t;
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
old mode 100644
new mode 100755
index c4636d0..771ac46
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -62,6 +62,8 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 TARFILE_NAME=libcdr-0.0.8
 TARFILE_MD5=ce5a1def34578b75959ac31210f031f6
 
+PATCH_FILES = libcdr-0.0.8-msc.patch
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] New Bugzilla Version Picker items – 2

[Bjoern Michaelsen]

On Mon, Jun 11, 2012 at 02:15:50PM +0200, Stephan Bergmann wrote:
> On 06/08/2012 03:45 PM, Petr Mladek wrote:
> >The problem might be the tilda '~'. It is substituted to $HOME in linux
> >shell.
> 
> ...but only at the beginning of a word.

It also has a special meaning in git, so using _ is the canonical solution.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - solenv/bin sw/source

[David Tardon]

 solenv/bin/install-gdb-printers |4 ++--
 sw/source/core/undo/untbl.cxx   |   24 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit b3473b9d227df79a383d09c2f2ebf6d6eebf3697
Author: David Tardon 
Date:   Mon Jun 11 15:17:12 2012 +0200

fdo#50896 SfxItemSets can contain emtpy element

Use vector instead of ptr_vector.

Change-Id: I4e7d0735cbb036c608f697f7418109a2c497982f

diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index ee16941..11dbb4b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -26,6 +26,10 @@
  *
  /
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -82,7 +86,7 @@
 
 extern void ClearFEShellTabCols();
 
-typedef boost::ptr_vector SfxItemSets;
+typedef std::vector > SfxItemSets;
 
 class SwUndoSaveSections : public boost::ptr_vector {
 public:
@@ -900,8 +904,8 @@ sal_uInt16 _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine 
)
 if( USHRT_MAX == nRet )
 {
 // Create copy of ItemSet
-SfxItemSet* pSet = new SfxItemSet( *pFmt->GetAttrSet().GetPool(),
-bIsLine ? aTableLineSetRange : aTableBoxSetRange );
+boost::shared_ptr pSet( new SfxItemSet( 
*pFmt->GetAttrSet().GetPool(),
+bIsLine ? aTableLineSetRange : aTableBoxSetRange ) );
 pSet->Put( pFmt->GetAttrSet() );
 // When a formula is set, never save the value. It possibly must be
 // recalculated.
@@ -1088,7 +1092,7 @@ void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, 
const SwTableBox* pTblBx,
 pFmt = pDoc->MakeTableLineFmt();
 else
 pFmt = pDoc->MakeTableBoxFmt();
-pFmt->SetFmtAttr( aSets[ nFmtPos ] );
+pFmt->SetFmtAttr( *aSets[ nFmtPos ] );
 aFrmFmts.Replace( pFmt, nFmtPos );
 }
 
@@ -1178,7 +1182,7 @@ void _SaveLine::CreateNew( SwTable& rTbl, SwTableBox& 
rParent, _SaveTable& rSTbl
 {
 SwDoc* pDoc = rTbl.GetFrmFmt()->GetDoc();
 pFmt = pDoc->MakeTableLineFmt();
-pFmt->SetFmtAttr( rSTbl.aSets[ nItemSet ] );
+pFmt->SetFmtAttr( *rSTbl.aSets[ nItemSet ] );
 rSTbl.aFrmFmts.Replace( pFmt, nItemSet );
 }
 SwTableLine* pNew = new SwTableLine( pFmt, 1, &rParent );
@@ -1270,7 +1274,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& 
rSTbl )
 SwCntntNode* pCNd = rNds[ n ]->GetCntntNode();
 if( pCNd )
 {
-SfxItemSet* pSet = &(*Ptrs.pCntntAttrs)[ nSet++ ];
+boost::shared_ptr pSet( (*Ptrs.pCntntAttrs)[ 
nSet++ ] );
 if( pSet )
 {
 sal_uInt16 *pRstAttr = aSave_BoxCntntSet;
@@ -1309,11 +1313,11 @@ void _SaveBox::SaveCntntAttrs( SwDoc* pDoc )
 SwCntntNode* pCNd = pDoc->GetNodes()[ n ]->GetCntntNode();
 if( pCNd )
 {
-SfxItemSet* pSet = 0;
+boost::shared_ptr pSet;
 if( pCNd->HasSwAttrSet() )
 {
-pSet = new SfxItemSet( pDoc->GetAttrPool(),
-aSave_BoxCntntSet );
+pSet.reset( new SfxItemSet( pDoc->GetAttrPool(),
+aSave_BoxCntntSet ) );
 pSet->Put( *pCNd->GetpSwAttrSet() );
 }
 
@@ -1332,7 +1336,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& 
rParent, _SaveTable& rSTbl
 {
 SwDoc* pDoc = rTbl.GetFrmFmt()->GetDoc();
 pFmt = pDoc->MakeTableBoxFmt();
-pFmt->SetFmtAttr( rSTbl.aSets[ nItemSet ] );
+pFmt->SetFmtAttr( *rSTbl.aSets[ nItemSet ] );
 rSTbl.aFrmFmts.Replace( pFmt, nItemSet );
 }
 
commit 18227e7c1c28c7b1c2e36db6b9786f966fe5238c
Author: David Tardon 
Date:   Mon Jun 11 14:09:39 2012 +0200

use ure instead of ure-link

Change-Id: I5368770926aee871e20b2d87fa51b28212c8be4f

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index c478929..51ab9e2 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
-make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
+make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
+make_autoload sal ure/lib libuno_sal."$DYLIB".3
 make_autoload svl program libsvllo."$DYLIB"
 make_autoload sw program libswlo."$DYLIB"
 make_autoload tl program libtllo."$DYLIB"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcdr/libcdr-0.0.8-msc.patch libcdr/makefile.mk

[Stephan Bergmann]

 libcdr/libcdr-0.0.8-msc.patch |   10 ++
 libcdr/makefile.mk|2 ++
 2 files changed, 12 insertions(+)

New commits:
commit d6576f9dd1d872b646d2cdc56a17d73f1d57dc13
Author: Stephan Bergmann 
Date:   Mon Jun 11 15:17:04 2012 +0200

MSC fix

Change-Id: I12c8ab5779d952eb640298478da7084b5f643568

diff --git a/libcdr/libcdr-0.0.8-msc.patch b/libcdr/libcdr-0.0.8-msc.patch
new file mode 100644
index 000..6a44e7d
--- /dev/null
+++ b/libcdr/libcdr-0.0.8-msc.patch
@@ -0,0 +1,10 @@
+--- misc/libcdr-0.0.8/src/lib/libcdr_utils.h   2012-06-06 13:42:03.0 
+0200
 misc/build/libcdr-0.0.8/src/lib/libcdr_utils.h 2012-06-11 
15:09:43.305289500 +0200
+@@ -50,6 +50,7 @@
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ typedef unsigned uint32_t;
++typedef short int16_t;
+ typedef int int32_t;
+ typedef unsigned __int64 uint64_t;
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
old mode 100644
new mode 100755
index c4636d0..771ac46
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -62,6 +62,8 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 TARFILE_NAME=libcdr-0.0.8
 TARFILE_MD5=ce5a1def34578b75959ac31210f031f6
 
+PATCH_FILES = libcdr-0.0.8-msc.patch
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sdext/Library_presenter.mk

[Michael Meeks]

 sdext/Library_presenter.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de4715a62db307e0a93fca5486d2a354ac74ff62
Author: Michael Meeks 
Date:   Mon Jun 11 14:11:24 2012 +0100

fdo#50964 - fix presenter console artwork location

Change-Id: I6c550bace0f085630116c86fa19fd0562a10951f

diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 29dcde5..058d8be 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_api,PresenterScreen,\
 ))
 
 $(eval $(call gb_Library_add_defs,PresenterScreen,\
--DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \
+-DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,PresenterScreen,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 50964, which changed state.

Bug 50964 Summary: PresenterConsole - missing all images...
https://bugs.freedesktop.org/show_bug.cgi?id=50964

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sdext/Library_presenter.mk

[Michael Meeks]

 sdext/Library_presenter.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bda192b6f4f81cf3290672d896e7c09e7499288c
Author: Michael Meeks 
Date:   Mon Jun 11 14:11:24 2012 +0100

fdo#50964 - fix presenter console artwork location

Change-Id: I6c550bace0f085630116c86fa19fd0562a10951f

diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 29dcde5..058d8be 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_api,PresenterScreen,\
 ))
 
 $(eval $(call gb_Library_add_defs,PresenterScreen,\
--DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \
+-DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,PresenterScreen,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Michael Meeks  changed:

   What|Removed |Added

 Depends on||50964

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] New Bugzilla Version Picker items – 2

[Stephan Bergmann]

On 06/08/2012 03:45 PM, Petr Mladek wrote:

The problem might be the tilda '~'. It is substituted to $HOME in linux
shell.


...but only at the beginning of a word.

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-5] xlsx make imported controls non-visible ( when marked as hidden )

[Fridrich Strba]

Looks straight forward

F.

On 08/06/12 12:59, Noel Power wrote:
> please consider this for 3.5, the vmldrawing 'style' part can specifiy
> if the drawing is 'hidden' while I am not sure what we can do with
> normal shapes certainly for controls there is the 'EnableVisible'
> property which can be applied. This patch ensures hidden controls are
> indeed hidden ( and not cluttering up the screen or covering other
> content etc. )
> 
> Noel
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - libcdr/libcdr-0.0.7-clang.patch libcdr/libcdr-0.0.7.patch libcdr/makefile.mk ooo.lst.in

[Fridrich Strba]

 libcdr/libcdr-0.0.7-clang.patch |  112 
 libcdr/libcdr-0.0.7.patch   |   20 ---
 libcdr/makefile.mk  |8 --
 ooo.lst.in  |2 
 4 files changed, 3 insertions(+), 139 deletions(-)

New commits:
commit 69c17e9a71a9ac5ab6cd1d346936b25bd00b8a5f
Author: Fridrich Å trba 
Date:   Mon Jun 11 14:29:00 2012 +0200

Uploading a new version of libcdr with initial text support

Change-Id: I616d284bb300c803d29786e50bb019fa3f2dff19
Signed-off-by: Fridrich Å trba 

diff --git a/libcdr/libcdr-0.0.7-clang.patch b/libcdr/libcdr-0.0.7-clang.patch
deleted file mode 100644
index fd5e163..000
--- a/libcdr/libcdr-0.0.7-clang.patch
+++ /dev/null
@@ -1,112 +0,0 @@
 misc/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 13:25:22.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.cpp   2012-04-24 
16:54:16.083829620 +0200
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include "CDRCollector.h"
-+#include "libcdr_utils.h"
- 
- libcdr::CDRParserState::CDRParserState()
-   : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(), 
m_pages(),
 misc/libcdr-0.0.7/src/lib/CDRCollector.h   2012-04-24 13:12:28.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 
16:54:16.084829635 +0200
-@@ -42,32 +42,7 @@
- 
- namespace
- {
--int cdr_round(double d)
--{
--  return (d>0) ? int(d+0.5) : int(d-0.5);
--}
--
--void writeU16(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--  buffer.append((unsigned char)((value >> 8) & 0xFF));
--}
--
--void writeU32(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--  buffer.append((unsigned char)((value >> 8) & 0xFF));
--  buffer.append((unsigned char)((value >> 16) & 0xFF));
--  buffer.append((unsigned char)((value >> 24) & 0xFF));
--}
--
--void writeU8(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--}
--
- #include "CDRColorProfiles.h"
--
- }
- 
- namespace libcdr
 misc/libcdr-0.0.7/src/lib/CDRParser.cpp2012-04-24 15:40:42.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRParser.cpp  2012-04-24 
16:54:16.084829635 +0200
-@@ -466,7 +466,7 @@
- m_collector->collectObject(level);
-   else if (listType == FOURCC_grp)
- m_collector->collectGroup(level);
--  else if ((listType & 0xff) == FOURCC_CDR || (listType && 0xff) 
== FOURCC_cdr)
-+  else if ((listType & 0xff) == FOURCC_CDR || (listType & 0xff) 
== FOURCC_cdr)
- m_version = getCDRVersion((listType & 0xff00) >> 24);
-   else if (listType == FOURCC_vect)
- m_collector->collectVect(level);
 misc/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 13:11:13.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.cpp   2012-04-24 
16:54:16.085829649 +0200
-@@ -139,6 +139,30 @@
-   return ((double)fixedPointNumberIntegerPart + 
fixedPointNumberFractionalPart);
- }
- 
-+int libcdr::cdr_round(double d)
-+{
-+  return (d>0) ? int(d+0.5) : int(d-0.5);
-+}
-+
-+void libcdr::writeU16(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+  buffer.append((unsigned char)((value >> 8) & 0xFF));
-+}
-+
-+void libcdr::writeU32(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+  buffer.append((unsigned char)((value >> 8) & 0xFF));
-+  buffer.append((unsigned char)((value >> 16) & 0xFF));
-+  buffer.append((unsigned char)((value >> 24) & 0xFF));
-+}
-+
-+void libcdr::writeU8(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+}
-+
- #ifdef DEBUG
- const char *libcdr::toFourCC(unsigned value, bool bigEndian)
- {
 misc/libcdr-0.0.7/src/lib/libcdr_utils.h   2012-04-24 16:54:56.803806935 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 
16:54:16.085829649 +0200
-@@ -35,6 +35,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
-@@ -90,6 +91,12 @@
- 
- double readFixedPoint(WPXInputStream *input, bool bigEndian=false);
- 
-+int cdr_round(double d);
-+
-+void writeU8(WPXBinaryData &buffer, const int value);
-+void writeU16(WPXBinaryData &buffer, const int value);
-+void writeU32(WPXBinaryData &buffer, const int value);
-+
- #ifdef DEBUG
- const char *toFourCC(unsigned value, bool bigEndian=false);
- #endif
diff --git a/libcdr/libcdr-0.0.7.patch b/libcdr/libcdr-0.0.7.patch
deleted file mode 100644
index 40d021a..000
--- a/libcdr/libcdr-0.0.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/libcdr-0.0.7/src/lib/libcdr_utils.h   2012-03-07 13:51:21.0 
+0100
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-08 
12:46:38.194534604 +0100
-@@ -54,17 +54,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#en

[Libreoffice-commits] .: libcdr/libcdr-0.0.7-clang.patch libcdr/libcdr-0.0.7.patch libcdr/makefile.mk ooo.lst.in

[Fridrich Strba]

 libcdr/libcdr-0.0.7-clang.patch |  112 
 libcdr/libcdr-0.0.7.patch   |   20 ---
 libcdr/makefile.mk  |8 --
 ooo.lst.in  |2 
 4 files changed, 3 insertions(+), 139 deletions(-)

New commits:
commit 3a678a9fb1702783d652cf8e2041350bad0543d3
Author: Fridrich Å trba 
Date:   Mon Jun 11 14:29:00 2012 +0200

Uploading a new version of libcdr with initial text support

Change-Id: I616d284bb300c803d29786e50bb019fa3f2dff19

diff --git a/libcdr/libcdr-0.0.7-clang.patch b/libcdr/libcdr-0.0.7-clang.patch
deleted file mode 100644
index fd5e163..000
--- a/libcdr/libcdr-0.0.7-clang.patch
+++ /dev/null
@@ -1,112 +0,0 @@
 misc/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 13:25:22.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.cpp   2012-04-24 
16:54:16.083829620 +0200
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include "CDRCollector.h"
-+#include "libcdr_utils.h"
- 
- libcdr::CDRParserState::CDRParserState()
-   : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(), 
m_pages(),
 misc/libcdr-0.0.7/src/lib/CDRCollector.h   2012-04-24 13:12:28.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 
16:54:16.084829635 +0200
-@@ -42,32 +42,7 @@
- 
- namespace
- {
--int cdr_round(double d)
--{
--  return (d>0) ? int(d+0.5) : int(d-0.5);
--}
--
--void writeU16(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--  buffer.append((unsigned char)((value >> 8) & 0xFF));
--}
--
--void writeU32(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--  buffer.append((unsigned char)((value >> 8) & 0xFF));
--  buffer.append((unsigned char)((value >> 16) & 0xFF));
--  buffer.append((unsigned char)((value >> 24) & 0xFF));
--}
--
--void writeU8(WPXBinaryData &buffer, const int value)
--{
--  buffer.append((unsigned char)(value & 0xFF));
--}
--
- #include "CDRColorProfiles.h"
--
- }
- 
- namespace libcdr
 misc/libcdr-0.0.7/src/lib/CDRParser.cpp2012-04-24 15:40:42.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/CDRParser.cpp  2012-04-24 
16:54:16.084829635 +0200
-@@ -466,7 +466,7 @@
- m_collector->collectObject(level);
-   else if (listType == FOURCC_grp)
- m_collector->collectGroup(level);
--  else if ((listType & 0xff) == FOURCC_CDR || (listType && 0xff) 
== FOURCC_cdr)
-+  else if ((listType & 0xff) == FOURCC_CDR || (listType & 0xff) 
== FOURCC_cdr)
- m_version = getCDRVersion((listType & 0xff00) >> 24);
-   else if (listType == FOURCC_vect)
- m_collector->collectVect(level);
 misc/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 13:11:13.0 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.cpp   2012-04-24 
16:54:16.085829649 +0200
-@@ -139,6 +139,30 @@
-   return ((double)fixedPointNumberIntegerPart + 
fixedPointNumberFractionalPart);
- }
- 
-+int libcdr::cdr_round(double d)
-+{
-+  return (d>0) ? int(d+0.5) : int(d-0.5);
-+}
-+
-+void libcdr::writeU16(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+  buffer.append((unsigned char)((value >> 8) & 0xFF));
-+}
-+
-+void libcdr::writeU32(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+  buffer.append((unsigned char)((value >> 8) & 0xFF));
-+  buffer.append((unsigned char)((value >> 16) & 0xFF));
-+  buffer.append((unsigned char)((value >> 24) & 0xFF));
-+}
-+
-+void libcdr::writeU8(WPXBinaryData &buffer, const int value)
-+{
-+  buffer.append((unsigned char)(value & 0xFF));
-+}
-+
- #ifdef DEBUG
- const char *libcdr::toFourCC(unsigned value, bool bigEndian)
- {
 misc/libcdr-0.0.7/src/lib/libcdr_utils.h   2012-04-24 16:54:56.803806935 
+0200
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 
16:54:16.085829649 +0200
-@@ -35,6 +35,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
-@@ -90,6 +91,12 @@
- 
- double readFixedPoint(WPXInputStream *input, bool bigEndian=false);
- 
-+int cdr_round(double d);
-+
-+void writeU8(WPXBinaryData &buffer, const int value);
-+void writeU16(WPXBinaryData &buffer, const int value);
-+void writeU32(WPXBinaryData &buffer, const int value);
-+
- #ifdef DEBUG
- const char *toFourCC(unsigned value, bool bigEndian=false);
- #endif
diff --git a/libcdr/libcdr-0.0.7.patch b/libcdr/libcdr-0.0.7.patch
deleted file mode 100644
index 40d021a..000
--- a/libcdr/libcdr-0.0.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/libcdr-0.0.7/src/lib/libcdr_utils.h   2012-03-07 13:51:21.0 
+0100
-+++ misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-08 
12:46:38.194534604 +0100
-@@ -54,17 +54,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #i

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements' - drawinglayer/inc drawinglayer/source

[Artur Dorda]

 drawinglayer/inc/drawinglayer/XShapeDumper.hxx |2 ++
 drawinglayer/source/dumper/XShapeDumper.cxx|   23 +++
 2 files changed, 25 insertions(+)

New commits:
commit 487f81a49446fc13b70f365227d0d894f00cb0dc
Author: Artur Dorda 
Date:   Mon Jun 11 14:03:39 2012 +0200

Added dumping NavigationOrder & Hyperlink properties

Change-Id: I15bd739657f04afd647f22a28a3b04ac066ce114

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 2e27505..3474995 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -161,6 +161,8 @@ private:
 void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr 
xmlWriter);
 void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 
aLine, xmlTextWriterPtr xmlWriter);
 void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 
aTransformation, xmlTextWriterPtr xmlWriter);
+void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, 
xmlTextWriterPtr xmlWriter);
+void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr 
xmlWriter);
 
 // XShape.idl
 void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 470d897..4775a24 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -941,6 +941,17 @@ namespace {
 xmlTextWriterEndElement( xmlWriter );
 }
 
+void XShapeDumper::dumpNavigationOrderAsAttribute(sal_Int32 
aNavigationOrder, xmlTextWriterPtr xmlWriter)
+   {
+   xmlTextWriterWriteFormatAttribute(xmlWriter, 
BAD_CAST("navigationOrder"), "%" SAL_PRIdINT32, aNavigationOrder);
+   }
+
+void XShapeDumper::dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, 
xmlTextWriterPtr xmlWriter)
+   {
+   xmlTextWriterWriteFormatAttribute(xmlWriter, 
BAD_CAST("hyperlink"), "%s",
+   rtl::OUStringToOString(sHyperlink, 
RTL_TEXTENCODING_UTF8).getStr());
+   }
+
 // 
 // -- XShape.idl --
 // 
@@ -1492,6 +1503,18 @@ namespace {
if(anotherAny >>= aTransformation)

dumpTransformationAsElement(aTransformation, xmlWriter);
}
+   {
+   uno::Any anotherAny = 
xPropSet->getPropertyValue("NavigationOrder");
+   sal_Int32 aNavigationOrder;
+   if(anotherAny >>= aNavigationOrder)
+   
dumpNavigationOrderAsAttribute(aNavigationOrder, xmlWriter);
+   }
+   {
+   uno::Any anotherAny = 
xPropSet->getPropertyValue("Hyperlink");
+   rtl::OUString sHyperlink;
+   if(anotherAny >>= sHyperlink)
+   dumpHyperlinkAsAttribute(sHyperlink, 
xmlWriter);
+   }
 }
 
 #if DEBUG_DUMPER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements' - 7 commits - drawinglayer/inc drawinglayer/source

[Artur Dorda]

 drawinglayer/inc/drawinglayer/XShapeDumper.hxx |   15 ++
 drawinglayer/source/dumper/XShapeDumper.cxx|  139 +
 2 files changed, 154 insertions(+)

New commits:
commit 26b404ef3c411a91be55f6f58b6ff686d0ec389e
Author: Artur Dorda 
Date:   Mon Jun 11 14:00:26 2012 +0200

Added dumping Transformation property

Change-Id: Id7ded83cee7798a1ddc3fc3ce7344d64b8f0f795

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 5c540ad..2e27505 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -52,6 +52,7 @@
 #include 
 
 #include 
+#include 
 
 #ifndef ChartViewDumper_hxx
 #define ChartViewDumper_hxx
@@ -159,6 +160,7 @@ private:
 void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter);
 void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr 
xmlWriter);
 void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 
aLine, xmlTextWriterPtr xmlWriter);
+void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 
aTransformation, xmlTextWriterPtr xmlWriter);
 
 // XShape.idl
 void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 4ef4569..470d897 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -917,11 +917,28 @@ namespace {
xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("sizeProtect"), "%s", "false");
}
 
-void XShapeDumper::dumpHomogenMatrixLine3(drawing::HomogenMatrixLine3 
aLine, xmlTextWriterPtr xmlWriter)
+void XShapeDumper::dumpHomogenMatrixLine3(drawing::HomogenMatrixLine3 
aHomogenMatrixLine3, xmlTextWriterPtr xmlWriter)
 {
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column1"), 
"%f", aLine.Column1);
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column2"), 
"%f", aLine.Column2);
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column3"), 
"%f", aLine.Column3);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column1"), 
"%f", aHomogenMatrixLine3.Column1);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column2"), 
"%f", aHomogenMatrixLine3.Column2);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("column3"), 
"%f", aHomogenMatrixLine3.Column3);
+}
+
+void XShapeDumper::dumpTransformationAsElement(drawing::HomogenMatrix3 
aTransformation, xmlTextWriterPtr xmlWriter)
+{
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Transformation" ));
+{
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line1" ));
+dumpHomogenMatrixLine3(aTransformation.Line1, xmlWriter);
+xmlTextWriterEndElement( xmlWriter );
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line2" ));
+dumpHomogenMatrixLine3(aTransformation.Line2, xmlWriter);
+xmlTextWriterEndElement( xmlWriter );
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Line3" ));
+dumpHomogenMatrixLine3(aTransformation.Line3, xmlWriter);
+xmlTextWriterEndElement( xmlWriter );
+}
+xmlTextWriterEndElement( xmlWriter );
 }
 
 // 
@@ -1469,6 +1486,12 @@ namespace {
if(anotherAny >>= bSizeProtect)

dumpSizeProtectAsAttribute(bSizeProtect, xmlWriter);
}
+   {
+   uno::Any anotherAny = 
xPropSet->getPropertyValue("Transformation");
+   drawing::HomogenMatrix3 aTransformation;
+   if(anotherAny >>= aTransformation)
+   
dumpTransformationAsElement(aTransformation, xmlWriter);
+   }
 }
 
 #if DEBUG_DUMPER
commit 5375a6828dbccc58a1a74ccca78bd8b75632cf9f
Author: Artur Dorda 
Date:   Mon Jun 11 01:03:06 2012 +0200

Added separate method to dump HomogenMatrixLine3 properties/fields

Change-Id: Id0c66cf82ce224364f4e15fe5a21fcf52b8cde3b

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 4244cc1..5c540ad 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -51,6 +51,8 @@
 #include 
 #include 
 
+#include 
+
 #ifndef ChartViewDumper_hxx
 #define ChartViewDumper_hxx
 
@@ -156,6 +158,7 @@ private:
 void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr 
xmlWriter);
 void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter);
 void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPt

[Libreoffice-commits] .: 2 commits - oox/source sw/qa

[Lubos Lunak]

 oox/source/vml/vmlshape.cxx|   15 ---
 sw/qa/extras/ooxmltok/ooxmltok.cxx |5 +
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 0016757efef898205452a586ba5927e5d11fdabe
Author: Luboš Luňák 
Date:   Fri Jun 8 19:31:32 2012 +0200

attempt to anchor vml shapes properly as they should be

This is a mess. Shapes from oox/vml are added to Writer by calling
SwXDrawPage::add(), which forces the shapes to be AT_PAGE, because
the pDoc->GetCurrentLayout() there is NULL. After that writerfilter
in DomainMapper_Impl::PushShapeContext() tries to do further
tricks with the anchoring. Such as the fix for bnc#764005
(0a412cc13edf0904524ee2cf1e38ccc36b713065) that broke inline shapes
because of the AT_PAGE above.

So try to set the proper anchoring already in oox, although I'm not
entirely sure I got it right. Ideally writerfilter should not touch
it, but when I simply removed it another testcase breaks, so hopefully
this all can be cleaned up somewhen later when we have enough testcases
for all the possibilities.

Change-Id: I7dd95d87bd027ce0f129f76b3377f3d1445c34d1

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b66546b..d0984ab 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -611,11 +611,20 @@ Reference< XShape > ComplexShape::implConvertAndInsert( 
const Reference< XShapes
 aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
 aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
 aPropSet.setProperty(PROP_Opaque, sal_False);
+// I'm not sure if AT_PAGE is always correct here (not sure 
what the parent that
+// the spec talks about can be), but with Writer 
SwXDrawPage::add()
+// always in practice uses this because of 
pDoc->GetCurrentLayout() being NULL at this point.
+aPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PAGE);
 }
-else if( maTypeModel.maPosition == "static" || 
maTypeModel.maPosition.isEmpty())
-{ // static position (the default) means anchored inline
-aPropSet.setProperty(PROP_AnchorType, 
makeAny(text::TextContentAnchorType_AS_CHARACTER));
+else if( maTypeModel.maPosition == "relative" )
+{   // I'm not very sure this is correct either.
+aPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PARAGRAPH);
 }
+else // static (is the default) means anchored inline
+{
+aPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AS_CHARACTER);
+}
+
 if ( maTypeModel.maPositionVerticalRelative == "page" )
 {
 aPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::PAGE_FRAME);
commit 87d28b3a6c3d2d442499672ad0dc1b6c9cd095d1
Author: Luboš Luňák 
Date:   Fri Jun 8 19:36:22 2012 +0200

test also for inline vml shape being anchored inline

This got broken by 0a412cc13edf0904524ee2cf1e38ccc36b713065.

Change-Id: I8d500ea54bee8b09e1a01cf4cd14d08669f49a73

diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index dbd56cd..c53a35f 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -263,9 +263,11 @@ void Test::testN705956_1()
 load( "n705956-1.docx" );
 /*
 Get the first image in the document and check it's the one image in the 
document.
+It should be also anchored inline (as character).
 image = ThisComponent.DrawPage.getByIndex(0)
 graphic = image.Graphic
 xray graphic.Size
+xray image.AnchorType
 */
 uno::Reference textDocument(mxComponent, 
uno::UNO_QUERY);
 uno::Reference drawPageSupplier(textDocument, 
uno::UNO_QUERY);
@@ -279,6 +281,9 @@ xray graphic.Size
 uno::Reference bitmap(graphic, uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL( static_cast(120), bitmap->getSize().Width 
);
 CPPUNIT_ASSERT_EQUAL( static_cast(106), 
bitmap->getSize().Height );
+text::TextContentAnchorType anchorType;
+imageProperties->getPropertyValue( "AnchorType" ) >>= anchorType;
+CPPUNIT_ASSERT_EQUAL( text::TextContentAnchorType_AS_CHARACTER, anchorType 
);
 }
 
 void Test::testN705956_2()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Using same User Profile with various users and / or LibO Versions

[Stephan Bergmann]

On 06/10/2012 10:08 AM, Rainer Bielefeld wrote:

it would be great if an expert could add some brief notes on
 concerning following
questions:

- Is it allowed/possible/useful to use the same User Profile with
more than 1 User?
- Is it allowed/useful/ to use the same User Profile with
different LibO Versions?


see 



Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#50141: Word Count Characters (with spaces) incorrect with Numbering on

[Michael Stahl]

On 09/06/12 23:57, Muhammad Haggag wrote:
> = Bug =
> https://bugs.freedesktop.org/show_bug.cgi?id=50141
> 
> = Patch =
> https://bugs.freedesktop.org/attachment.cgi?id=62850
> 
> = Patch Review =
> https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=50141&attachment=62850
> 
> = Changes =
> There was a typo in the character counting code of text nodes. When a 
> numbered list is detected, the code attempts to add the character count 
> of the "item number" to the total count, but ends up overwriting it 
> instead (uses '=' instead of '+='). This resulted in the item number 
> strings to be the only ones counted in a numbered list.

interesting, that looks like a regression from
12db5315fca413ae66e88c4cd8212ee3b01667b7
"Follow UAX-29 and present user-perceived character counts".

thanks for the patch, pushed to master, libreoffice-3-6, libreoffice-3-5

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Michael Stahl]

 sw/source/core/txtnode/txtedt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbfc736fcdf06bd2d02aac7fe83cd3080c897c27
Author: Muhammad Haggag 
Date:   Sat Jun 9 23:48:27 2012 +0200

fdo#50141: Character count (with spaces) incorrect with numbering on.

There was a typo in the character counting code of text nodes. When a 
numbered list is detected, the code attempts to add the character count of the 
"item number" to the total count, but ends up overwriting it instead (uses '=' 
instead of '+='). This resulted in the item number strings to be the only ones 
counted in a numbered list.

Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4
(cherry picked from commit a585863f013aa4207270e11f5e031126adf1ed4a)

Signed-off-by: Michael Stahl 

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index d153212..5a7ae5e 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1892,7 +1892,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
 nTmpCharsExcludingSpaces += 
pBreakIt->getGraphemeCount(aScanner.GetWord());
 }
 
-nTmpChars = pBreakIt->getGraphemeCount(aNumString);
+nTmpChars += pBreakIt->getGraphemeCount(aNumString);
 }
 else if ( HasBullet() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Michael Stahl]

 sw/source/core/txtnode/txtedt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29ff3d49c8f0bc45a322d3ab67300bd269593181
Author: Muhammad Haggag 
Date:   Sat Jun 9 23:48:27 2012 +0200

fdo#50141: Character count (with spaces) incorrect with numbering on.

There was a typo in the character counting code of text nodes. When a 
numbered list is detected, the code attempts to add the character count of the 
"item number" to the total count, but ends up overwriting it instead (uses '=' 
instead of '+='). This resulted in the item number strings to be the only ones 
counted in a numbered list.

Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4
(cherry picked from commit a585863f013aa4207270e11f5e031126adf1ed4a)

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index f65bfe9..3fbef67 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1939,7 +1939,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
 nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord);
 }
 
-nTmpChars = pBreakIt->getGraphemeCount(aNumString);
+nTmpChars += pBreakIt->getGraphemeCount(aNumString);
 }
 else if ( HasBullet() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Michael Stahl]

 sw/source/core/txtnode/txtedt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a585863f013aa4207270e11f5e031126adf1ed4a
Author: Muhammad Haggag 
Date:   Sat Jun 9 23:48:27 2012 +0200

fdo#50141: Character count (with spaces) incorrect with numbering on.

There was a typo in the character counting code of text nodes. When a 
numbered list is detected, the code attempts to add the character count of the 
"item number" to the total count, but ends up overwriting it instead (uses '=' 
instead of '+='). This resulted in the item number strings to be the only ones 
counted in a numbered list.

Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index f65bfe9..3fbef67 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1939,7 +1939,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
 nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord);
 }
 
-nTmpChars = pBreakIt->getGraphemeCount(aNumString);
+nTmpChars += pBreakIt->getGraphemeCount(aNumString);
 }
 else if ( HasBullet() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: --disable mozilla necessary for Ubuntu

[Bjoern Michaelsen]

On Fri, Jun 08, 2012 at 07:12:39AM -0700, Joel Madero wrote:
> I'd like to see a patch, someone want me to open up a bug report?

disable-mozzilla per default is good. If you have a patch just send it to this
list and CC me, I will push it then.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   15 +++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++
 2 files changed, 17 insertions(+)

New commits:
commit e08ab74b918be1473d91ed234ee7870cab137c7e
Author: Miklos Vajna 
Date:   Mon Jun 11 12:17:10 2012 +0200

fdo#49659 handle RTF import of tables at the very end of the document

If the documents ends with a table, both Word/Writer produces a
non-table empty paragraph after that table. However, it's valid not to
emit that empty paragraph, so handle the situation in the importer.

Change-Id: I8ea163f2de62954f3891f8f48e81d89f6e29ce6f

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c2c1b60..caff491 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -249,6 +249,7 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_bNeedPap(true),
 m_bNeedCr(false),
 m_bNeedPar(true),
+m_bNeedFinalPar(false),
 m_aListTableSprms(),
 m_aSettingsTableAttributes(),
 m_aSettingsTableSprms(),
@@ -481,6 +482,12 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
 // If there is no paragraph in this section, then insert a dummy one, as 
required by Writer
 if (m_bNeedPar)
 dispatchSymbol(RTF_PAR);
+// It's allowed to not have a non-table paragraph at the end of an RTF 
doc, add it now if required.
+if (m_bNeedFinalPar && bFinal)
+{
+dispatchFlag(RTF_PARD);
+dispatchSymbol(RTF_PAR);
+}
 while (m_nHeaderFooterPositions.size())
 {
 std::pair aPair = m_nHeaderFooterPositions.front();
@@ -1437,6 +1444,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 m_bNeedPap = true;
 if (!m_aStates.top().aFrame.inFrame())
 m_bNeedPar = false;
+m_bNeedFinalPar = false;
 }
 break;
 case RTF_SECT:
@@ -1541,6 +1549,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 
 tableBreak();
 m_bNeedPap = true;
+m_bNeedFinalPar = true;
 m_aTableBuffer.clear();
 m_aStates.top().nCells = 0;
 m_aStates.top().aTableCellsSprms.clear();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 93ed15d..9bb994d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -444,6 +444,8 @@ namespace writerfilter {
 /// If we need to emit a CR at the end of substream.
 bool m_bNeedCr;
 bool m_bNeedPar;
+/// If set, an empty paragraph will be added at the end of the 
document.
+bool m_bNeedFinalPar;
 /// The list table and list override table combined.
 RTFSprms m_aListTableSprms;
 /// The settings table attributes.
commit c5c3ce5e625a31d78a21fbbc339ee30ba99f3044
Author: Miklos Vajna 
Date:   Mon Jun 11 11:19:19 2012 +0200

fdo#49659 fix RTF import of pictures with inner groups

One would think that with {\pict{\foo1}}, the inner group has no effect
in the outer group, but this turns out to be valid, so we should handle
it as well.

Change-Id: I64b933ad1cd5946f22d27669e9240d9e1875bde3

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b2a6962..c2c1b60 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -620,6 +620,10 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 else
 pStream = m_pBinaryData.get();
 
+if (!pStream->Tell())
+// No destination text? Then we'll get it later.
+return 0;
+
 // Store, and get its URL.
 pStream->Seek(0);
 uno::Reference xInputStream(new 
utl::OInputStreamWrapper(pStream));
@@ -3529,6 +3533,8 @@ int RTFDocumentImpl::popState()
 if (aState.nFieldStatus == FIELD_INSTRUCTION)
 singleChar(0x15);
 }
+else if (m_aStates.size() && m_aStates.top().nDestinationState == 
DESTINATION_PICT)
+m_aStates.top().aPicture = aState.aPicture;
 else if (bPopShapeProperties)
 {
 m_aStates.top().aShape = aShape;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-5] fdo#50304 ( regression I guess )

[Fridrich Strba]

+1 from me

Fridrich

On 08/06/12 12:58, Noel Power wrote:
> Row heights when exporting xls ( and xlsx ) documents seems quite
> broken, some are exported (sometimes) others not but always it seems the
> result is not so nice. There is more detail in and test document in
> https://bugs.freedesktop.org/show_bug.cgi?id=50304
> 
> Noel
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Fridrich Strba]

 sc/source/filter/excel/xetable.cxx |   53 ++---
 1 file changed, 38 insertions(+), 15 deletions(-)

New commits:
commit c9749c917e67a70a0cb283e180fd1c05f0cf3c2a
Author: Noel Power 
Date:   Thu May 24 12:44:19 2012 +0100

fix excel row height export problems ( I hope ) fdo#50304

Change-Id: I43ddb32ecba36107f5973fa5dcf2499cd1330668

Signed-off-by: Fridrich Å trba 

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index b316618..d77c1e4 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2031,22 +2031,41 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& 
rDefRowData, const ScfUInt
 XclExpDefaultRowData aMaxDefData;
 size_t nMaxDefCount = 0;
 // only look for default format in existing rows, if there are more than 
unused
-for (itr = itrBeg; itr != itrEnd; ++itr)
+bool bSearchExisting = ( maRowMap.size() >= (  GetMaxPos().Row() - 
maRowMap.size() ) );
+if ( bSearchExisting )
 {
-const RowRef& rRow = itr->second;
-if (rRow->IsDefaultable())
+for (itr = itrBeg; itr != itrEnd; ++itr)
 {
-XclExpDefaultRowData aDefData( *rRow );
-size_t& rnDefCount = aDefRowMap[ aDefData ];
-++rnDefCount;
-if( rnDefCount > nMaxDefCount )
+const RowRef& rRow = itr->second;
+if (rRow->IsDefaultable())
 {
-nMaxDefCount = rnDefCount;
-aMaxDefData = aDefData;
+XclExpDefaultRowData aDefData( *rRow );
+size_t& rnDefCount = aDefRowMap[ aDefData ];
+++rnDefCount;
+if( rnDefCount > nMaxDefCount )
+{
+nMaxDefCount = rnDefCount;
+aMaxDefData = aDefData;
+}
+}
+}
+}
+else
+{
+// find a suitable unused row to get the default height from,
+// searching backwards from max row
+for ( SCROW nRow = GetMaxPos().Row(); nRow >= 0; --nRow )
+{
+if ( maRowMap.find( nRow ) == maRowMap.end() )
+{
+// use first encountered unused row height as default
+// I wonder should we do this always ( and abandon the search
+// of exising rows )
+aMaxDefData.mnHeight = GetDoc().GetRowHeight(nRow, 
GetCurrScTab(), false);
+break;
 }
 }
 }
-
 // return the default row format to caller
 rDefRowData = aMaxDefData;
 
@@ -2148,13 +2167,17 @@ XclExpDimensions* XclExpRowBuffer::GetDimensions()
 
 XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool 
bRowAlwaysEmpty )
 {
-RowMap::iterator itr = maRowMap.find(nXclRow);
-if (itr == maRowMap.end())
+RowMap::iterator itr = maRowMap.begin();
+for ( size_t nFrom = maRowMap.size(); nFrom <= nXclRow; ++nFrom )
 {
-RowRef p(new XclExpRow(GetRoot(), nXclRow, maOutlineBfr, 
bRowAlwaysEmpty));
-::std::pair r = 
maRowMap.insert(RowMap::value_type(nXclRow, p));
-itr = r.first;
+itr = maRowMap.find(nFrom);
+if ( itr == maRowMap.end() )
+{
+RowRef p(new XclExpRow(GetRoot(), nFrom, maOutlineBfr, 
bRowAlwaysEmpty));
+maRowMap.insert(RowMap::value_type(nFrom, p));
+}
 }
+itr = maRowMap.find(nXclRow);
 return *itr->second;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Strba]

 oox/inc/oox/vml/vmlshape.hxx   |1 +
 oox/source/vml/vmlshape.cxx|   11 +--
 oox/source/vml/vmlshapecontext.cxx |2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 21f43fb084c4c468c3f5722058325903a8e3daf9
Author: Noel Power 
Date:   Thu Jun 7 15:25:06 2012 +0100

import vmlshape 'hidden' style attribute and apply to controls bnc#757609

ensure 'hidden' controls are imported as such.

Change-Id: Ie79e61f06d65c86db9d1a734e85b27ee368bebe8

Signed-off-by: Fridrich Å trba 

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 1926a08..3817629 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -79,6 +79,7 @@ struct ShapeTypeModel
 ::rtl::OUString maMarginLeft;   /// X position of the shape 
bounding box to shape anchor (number with unit).
 ::rtl::OUString maMarginTop;/// Y position of the shape 
bounding box to shape anchor (number with unit).
 sal_BoolmbAutoHeight;   /// If true, the height value 
is a minimum value (mostly used for textboxes)
+sal_BoolmbVisible;  /// Visible or Hidden
 
 StrokeModel maStrokeModel;  /// Border line formatting.
 FillModel   maFillModel;/// Shape fill formatting.
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 4f1b40f..0985daf 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -171,7 +172,8 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, 
const Rectangle& rSha
 // 
 
 ShapeTypeModel::ShapeTypeModel():
-mbAutoHeight( sal_False )
+mbAutoHeight( sal_False ),
+mbVisible( sal_True )
 {
 }
 
@@ -361,7 +363,12 @@ Reference< XShape > ShapeBase::convertAndInsert( const 
Reference< XShapes >& rxS
 PropertySet aShapeProp( xShape );
 if( aShapeProp.hasProperty( PROP_Name ) )
 aShapeProp.setProperty( PROP_Name, getShapeName() );
-
+Reference< XControlShape > xControlShape( xShape, UNO_QUERY );
+if ( xControlShape.is() && !getTypeModel().mbVisible )
+{
+PropertySet aControlShapeProp( xControlShape->getControl() 
);
+aControlShapeProp.setProperty( PROP_EnableVisible, 
makeAny( sal_False ) );
+}
 /*  Notify the drawing that a new shape has been inserted. For
 convenience, pass the rectangle that contains position and
 size of the shape. */
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index cb64424..a8dd809 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -347,6 +347,8 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"margin-left" ) ) )   mrTypeModel.maMarginLeft = aValue;
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"margin-top" ) ) )mrTypeModel.maMarginTop = aValue;
 else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"mso-fit-shape-to-text" ) ) )  mrTypeModel.mbAutoHeight = sal_True;
+else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"visibility" ) ) )
+mrTypeModel.mbVisible = !aValue.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM("hidden") );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED-3.5] don't rotate two-cell anchored objects

[Fridrich Strba]

The patch looks good

F.

On 08/06/12 12:58, Noel Power wrote:
> noticed this with a customer document, the rotation an imported shape (
> e.g. a custom shape like an arrow ) when the anchor is twoCell is
> determined by the anchor position and geometry, applying the rotation
> screws up the import completely, not only is the shape now rotated
> incorrectly but the position is all messed up too
> 
> Noel
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Fridrich Strba]

 oox/source/xls/drawingfragment.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit eee0a07a8119bf097b680e4481302f3ab2e68eac
Author: Noel Power 
Date:   Wed May 30 14:06:27 2012 +0100

don't rotate calc shapes if twoCellAnchor, partial fix bnc#762542

Change-Id: I3ccf6d87db2e9c33f2adaf92e138018f2e27528b

Signed-off-by: Fridrich Å trba 

diff --git a/oox/source/xls/drawingfragment.cxx 
b/oox/source/xls/drawingfragment.cxx
index 64f0164..c547b76 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -274,6 +274,10 @@ void DrawingFragment::onEndElement()
 case XDR_TOKEN( twoCellAnchor ):
 if( mxDrawPage.is() && mxShape.get() && mxAnchor.get() )
 {
+// Rotation is decided by orientation of shape determined
+// by the anchor position given by 'twoCellAnchor'
+if ( getCurrentElement() == XDR_TOKEN( twoCellAnchor ) )
+mxShape->setRotation(0);
 EmuRectangle aShapeRectEmu = mxAnchor->calcAnchorRectEmu( 
getDrawPageSize() );
 if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && 
(aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED-3.5] partial fix for fdo#49430 this missing control part ( which is a regression from 3.4 )

[Fridrich Strba]

Trivial fix,

Goes for 3.5

F.

On 08/06/12 12:58, Noel Power wrote:
> subject says it all, calculation of the row/col offsets in 3.5 causes
> problems, this patch tweaks it back to doing what it did in 3.4 ( e.g.
> treating the the offsets as being in screen units )
> 
> Noel
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Fridrich Strba]

 oox/source/xls/drawingbase.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit edd7b00431f5d3c008437e974b93dda804300bbf
Author: Noel Power 
Date:   Wed May 30 13:59:52 2012 +0100

fix missing form control, partial fix for fdo#49430

Change-Id: I7a0dd3d6e25a48449941e258ea5a16a247a8fe05

Signed-off-by: Fridrich Å trba 

diff --git a/oox/source/xls/drawingbase.cxx b/oox/source/xls/drawingbase.cxx
index 3369ba9..c75fa6d 100644
--- a/oox/source/xls/drawingbase.cxx
+++ b/oox/source/xls/drawingbase.cxx
@@ -170,6 +170,7 @@ void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 
nParentContext, cons
 void ShapeAnchor::importVmlAnchor( const OUString& rAnchor )
 {
 meAnchorType = ANCHOR_VML;
+meCellAnchorType = CELLANCHOR_PIXEL;
 
 ::std::vector< OUString > aTokens;
 sal_Int32 nIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-5] fix xlsx height import

[Fridrich Strba]

The patch looks reasonable

f.

On 08/06/12 12:58, Noel Power wrote:
> There are two problems addressed here
> firstly for the xlsx importer like the xls importer we really don't want
> to call UpdateAllRowHeights ( which autocalculates row heights ),
> currently when the api property IsAdjustHeightEnabled set to true it
> calls UpdateAllRowHeights. This doesn't live up to the spirit of the
> name of the property and also it is counter productive. ( Note: this api
> property was only created for the filter in the first place because of
> the way the uno api triggers potentially triggers UpdateAllRowHeights
> during import )
> Secondly row heights that are specified but that are not marked as
> custom heights are mostly ignored this results in wrong row heights in
> imported documents ( and subsequent layout problems ) ( see
> https://bugs.freedesktop.org/attachment.cgi?id=60991 from fdo#49430
> where Row 2,5,6 etc. are imported at 4.69mm without the patch compared
> to 5.03mm which is what is imported from
> https://bugs.freedesktop.org/attachment.cgi?id=60994 ( the xls version
> of the same document ). Additionally there are documents from  attached
> to i#94028 &  i#93609 which don't currently behave well that this patch
> seems to fix ( but as ever happy for a second opinion )
> 
> 
> patch attached is a squash ( and backport ) of
> master:764752f5d85cb7c86ad21340dfdda4b62754790c &
> master:1cdfe7519a94d35f3fb47eed3331397cc11129b5
> 
> thanks,
> 
> Noel
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Fridrich Strba]

 oox/source/xls/sheetdatabuffer.cxx |2 --
 oox/source/xls/worksheethelper.cxx |   30 +++---
 sc/source/ui/unoobj/docuno.cxx |4 
 sc/source/ui/view/drawutil.cxx |   12 
 sc/source/ui/view/drawvie4.cxx |2 +-
 sc/source/ui/view/drawview.cxx |2 +-
 sc/source/ui/view/gridwin3.cxx |2 +-
 7 files changed, 6 insertions(+), 48 deletions(-)

New commits:
commit d712d16d9adf9a711ce78e5ead8c55f7bf3ee1a6
Author: Noel Power 
Date:   Fri Jun 8 11:05:57 2012 +0100

better import xlsx heights

don't call UpdateAllRowHeights when IsAdjustHeightEnabled property is set an
d additionally set manual heights for *all* imported row heights ( same 
afaics x
ls import does ) - certainly this improves import ( also see documents 
attached
in i#94028, i#93609 )

Change-Id: I19d46753cf692bc9768512a2267e03a7a75a0f6e

Signed-off-by: Fridrich Å trba 

diff --git a/oox/source/xls/sheetdatabuffer.cxx 
b/oox/source/xls/sheetdatabuffer.cxx
index 0839b9d..5b314ac 100644
--- a/oox/source/xls/sheetdatabuffer.cxx
+++ b/oox/source/xls/sheetdatabuffer.cxx
@@ -921,8 +921,6 @@ void SheetDataBuffer::finalizeMergedRange( const 
CellRangeAddress& rRange )
 Reference< XText > xText( xTopLeft, UNO_QUERY );
 bTextWrap = xText.is() && (xText->getString().indexOf( '\x0A' 
) >= 0);
 }
-if( bTextWrap )
-setManualRowHeight( rRange.StartRow );
 }
 }
 catch( Exception& )
diff --git a/oox/source/xls/worksheethelper.cxx 
b/oox/source/xls/worksheethelper.cxx
index e8a2972..bdf6754 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -335,8 +335,6 @@ public:
 @descr  Row default formatting is converted directly, other settings
 are cached and converted in the finalizeImport() call. */
 voidsetRowModel( const RowModel& rModel );
-/** Specifies that the passed row needs to set its height manually. */
-voidsetManualRowHeight( sal_Int32 nRow );
 
 /** Initial conversion before importing the worksheet. */
 voidinitializeWorksheetImport();
@@ -394,7 +392,6 @@ private:
 RowModelRangeMapmaRowModels;/// Ranges of rows sorted by first 
row index.
 HyperlinkModelList  maHyperlinks;   /// Cell ranges containing 
hyperlinks.
 ValidationModelList maValidations;  /// Cell ranges containing data 
validation settings.
-ValueRangeSet   maManualRowHeights; /// Rows that need manual height 
independent from own settings.
 SheetDataBuffer maSheetData;/// Buffer for cell contents and 
cell formatting.
 CondFormatBuffermaCondFormats;  /// Buffer for conditional 
formatting.
 CommentsBuffer  maComments; /// Buffer for all cell comments 
in this sheet.
@@ -930,11 +927,6 @@ void WorksheetGlobals::setRowModel( const RowModel& rModel 
)
 lclUpdateProgressBar( mxRowProgress, maUsedArea, nRow );
 }
 
-void WorksheetGlobals::setManualRowHeight( sal_Int32 nRow )
-{
-maManualRowHeights.insert( nRow );
-}
-
 void WorksheetGlobals::initializeWorksheetImport()
 {
 // set default cell style for unused cells
@@ -1223,20 +1215,9 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& 
orRowLevels,
 sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT );
 if( nHeight > 0 )
 {
-/*  Get all rows that have custom height inside the passed row model.
-If the model has the custom height flag set, all its rows have
-custom height, otherwise get all rows specified in the class member
-maManualRowHeights that are inside the passed row model. */
-ValueRangeVector aManualRows;
-if( rModel.mbCustomHeight )
-aManualRows.push_back( rRowRange );
-else
-aManualRows = maManualRowHeights.getIntersection( rRowRange );
-for( ValueRangeVector::const_iterator aIt = aManualRows.begin(), aEnd 
= aManualRows.end(); aIt != aEnd; ++aIt )
-{
-PropertySet aPropSet( getRows( *aIt ) );
-aPropSet.setProperty( PROP_Height, nHeight );
-}
+/* always import the row height, ensures better layout */
+PropertySet aPropSet( getRows( rRowRange ) );
+aPropSet.setProperty( PROP_Height, nHeight );
 }
 
 // hidden rows: TODO: #108683# hide rows later?
@@ -1645,11 +1626,6 @@ void WorksheetHelper::setRowModel( const RowModel& 
rModel )
 mrSheetGlob.setRowModel( rModel );
 }
 
-void WorksheetHelper::setManualRowHeight( sal_Int32 nRow )
-{
-mrSheetGlob.setManualRowHeight( nRow );
-}
-
 void WorksheetHelper::putValue( const CellAddress& rAddress, double fValue ) 
const
 {
 Reference< XCell > xCell = getCell( rAddress );
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b9be493..125f4a9 10064

Re: [PUSHED 3-5] some shape position skew

[Fridrich Strba]

>From the description, reverting is good :)

Done

F.

On 08/06/12 12:56, Noel Power wrote:
> although 31012ab9d7035f942486c87ecc1a79b4d6579975 ( and associated fix
> 8a838b9fbf46ece9680824cd3a044ab7338bf306 ) make the document mentioned
> in https://issues.apache.org/ooo/show_bug.cgi?id=116848 behave better
> with zoom, it makes other documents much worse ( even at 100% zoom )
> e.g. the document attached to  fdo#49430. When you modify the zoom then
> the situation gets much much worse. So what I see is
> 
> a) with commits 31012ab9d7035f942486c87ecc1a79b4d6579975 ( and
> associated fix 8a838b9fbf46ece9680824cd3a044ab7338bf306 ) we have one
> test document ( associated with the orig bug ) that experiences no skew
> of the relative position of the shape to the position of the cell the
> shape is anchored to ( regardless of the zoom ). However we have other
> documents ( typically where the shapes are located further down the
> document ) where there is significant skew between the shape position
> and associated cell it is anchored to. Note: in these cases changing the
> zoom results in wild relative position changes ( e.g. a number of rows
> offset )
> 
> b) with the commits above reverted the test document associated with
> i#116848 is indeed not behaving itself at zoom levels other than 100% (
> so that bug will still exist ) but... with the other scenario ( with
> shapes located much further down the document e.g. with the document
> attached to fdo#49430 ) behave much better, indeed the shapes ( at 100%
> zoom ) are at the correct position. In both cases changing the zoom
> seems only to affect the relative position error in a small way ( e.g.
> less than a row height )
> 
> Eike we discussed this previously on IRC and I already reverted these
> patches on master, I think we should revert these on 3.5 also, to me the
> behaviour without these commits is better than with them ( but thats
> just my opinion hence the review request ) It would be great to fix the
> underlying error, unfortunately I didn't have any luck with that. So...
> please consider reverting 31012ab9d7035f942486c87ecc1a79b4d6579975 ( and
> associated fix 8a838b9fbf46ece9680824cd3a044ab7338bf306 )
> 
> thanks,
> 
> Noel
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice