date:20120509

 sc/source/ui/view/output.cxx |   95 ++-
 1 file changed, 58 insertions(+), 37 deletions(-)

New commits:
commit b7ef4c31a623b3763434379df0a56c10bec77080
Author: Markus Mohrhard 
Date:   Thu May 10 05:12:27 2012 +0200

render color scales correctly

Change-Id: I622b8911122e1c0693e0cbf5de8e6da1b09411c0

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 08d1377..0c46c0b 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -788,6 +788,59 @@ void ScOutputData::DrawDocumentBackground()
 pDev->DrawRect(aRect);
 }
 
+namespace {
+
+void drawCells(const Color* pColor, const SvxBrushItem* pBackground, const 
Color*& pOldColor, const SvxBrushItem*& pOldBackground,
+Rectangle& rRect, long nPosX, long nSignedOneX, OutputDevice* pDev)
+{
+
+// need to paint if old color scale has been used and now
+// we have a different color or a style based background
+// we can here fall back to pointer comparison
+if (pOldColor && (pBackground || pOldColor != pColor))
+{
+
+rRect.Right() = nPosX-nSignedOneX;
+if( !pOldColor->GetTransparency() )
+{
+pDev->SetFillColor( *pOldColor );
+pDev->DrawRect( rRect );
+}
+rRect.Left() = nPosX - nSignedOneX;
+}
+
+if ( pOldBackground && (pColor ||pBackground != pOldBackground) )
+{
+rRect.Right() = nPosX-nSignedOneX;
+if (pOldBackground) // ==0 if hidden
+{
+Color aBackCol = pOldBackground->GetColor();
+if ( !aBackCol.GetTransparency() )  //! partial transparency?
+{
+pDev->SetFillColor( aBackCol );
+pDev->DrawRect( rRect );
+}
+}
+rRect.Left() = nPosX - nSignedOneX;
+}
+
+if(pColor)
+{
+// only update pOldColor if the colors changed
+if (!pOldColor || *pOldColor != *pColor)
+pOldColor = pColor;
+
+pOldBackground = NULL;
+}
+else if(pBackground)
+{
+pOldBackground = pBackground;
+pOldColor = NULL;
+}
+}
+
+}
+
 void ScOutputData::DrawBackground()
 {
 FindRotated();  //! von aussen ?
@@ -842,6 +895,8 @@ void ScOutputData::DrawBackground()
 
 const SvxBrushItem* pOldBackground = NULL;
 const SvxBrushItem* pBackground;
+const Color* pOldColor = NULL;
+const Color* pColor = NULL;
 for (SCCOL nX=nX1; nX<=nX2; nX++)
 {
 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
@@ -880,46 +935,12 @@ void ScOutputData::DrawBackground()
 pBackground = lcl_FindBackground( pDoc, nX, nY, nTab );
 }
 
-if( pInfo->pColorScale )
-{
-pOldBackground = NULL;
+pColor = pInfo->pColorScale;
+drawCells( pColor, pBackground, pOldColor, pOldBackground, 
aRect, nPosX, nSignedOneX, pDev );
 
-aRect.Right() = nPosX-nSignedOneX;
-const Color* pColor = pInfo->pColorScale;
-if( !pColor->GetTransparency() )
-{
-pDev->SetFillColor( *pColor );
-pDev->DrawRect( aRect );
-}
-aRect.Left() = nPosX - nSignedOneX;
-}
-else if ( pBackground != pOldBackground )
-{
-aRect.Right() = nPosX-nSignedOneX;
-if (pOldBackground) // ==0 if hidden
-{
-Color aBackCol = pOldBackground->GetColor();
-if ( !aBackCol.GetTransparency() )  //! 
partial transparency?
-{
-pDev->SetFillColor( aBackCol );
-pDev->DrawRect( aRect );
-}
-}
-aRect.Left() = nPosX - nSignedOneX;
-pOldBackground = pBackground;
-}
 nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
 }
-aRect.Right() = nPosX-nSignedOneX;
-if (pOldBackground)
-{
-Color aBackCol = pOldBackground->GetColor();
-if ( !aBackCol.GetTransparency() )  //! partial 
transparency?
-{
-pDev->SetFillColor( aBackCol );
-pDev->DrawRect( aRect );
-}
-}
+drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, 
nPosX, nSignedOneX, pDev );
 
 nArrY += nSk

[Libreoffice-commits] .: sc/source

 sc/source/ui/view/output.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit a68b2aaa55da76089b486e2764418324abaf6c3e
Author: Markus Mohrhard 
Date:   Thu May 10 03:04:28 2012 +0200

remove debug output

Change-Id: I58e8dc576de18df6da22388a7c25295b260bf98b

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 72db311..08d1377 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -73,8 +73,6 @@
 
 #include 
 
-#include 
-
 using namespace com::sun::star;
 
 // STATIC DATA ---
@@ -884,8 +882,6 @@ void ScOutputData::DrawBackground()
 
 if( pInfo->pColorScale )
 {
-std::cout << "pColorScale: finally Found it !" << 
std::endl;
-std::cout << nX << " " << nArrY << std::endl;
 pOldBackground = NULL;
 
 aRect.Right() = nPosX-nSignedOneX;
@@ -1518,7 +1514,6 @@ void ScOutputData::DrawRotatedFrame( const Color* 
pForceColor )
 }
 else
 {
-std::cout << "ColorScale" << std::endl;
 Polygon aPoly( 4, aPoints );
 const Color* pColor = pInfo->pColorScale;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

How to add color scales to ODF?

Hey,

I just reached a state where I can think about adding support for
color scales into ODF. Normally this would not be such a big deal but
for color scales we face several problems.

Color scales are a form of conditional formatting but our current
conditional formatting system is based on styles where color scales (
and data bars ) don't fit in. The problem is now that conditional
formatting is part of the styles in ODF and applied to a cell through
a style. I have the same problem internally but there I was able to
circumvent that problem till now by implementing a own set of data
structures for color scales.

The current structure of a conditional format in ods looks like:


  
  
  


Now we have color scales which are no longer bound to styles because
they calculate the correct formatting information based on the value
of the cell. I would not want to add them to the existing style based
system because they don't fit into there. We will need to add
different conditions for them and different ways to represent them.

In OOXML normal conditional formats are represented in the
[sheetx].xml file and refer to formatting changes in the styles
section. Color scales however are represented in the same structure
but contain all their information as sub elements. The structure of
the attached test file is:


  

  
  
  
  

  


I'm open for suggestions how I can add this sanely to ods. I would
like to support as much from MSO 2010's color scale feature as
possible but have no idea yet what I can achieve in the remaining 4
weeks.

Regards,
Markus

Attached is my test document ( the only document that I support right
now ) and a screenshot showing how it is rendered right now. I know
that it is not rendered correctly right now.


SimpleColorScale.xlsx
Description: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
<>___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sc/inc/colorscale.hxx |2 
 sc/inc/fillinfo.hxx   |   11 +++
 sc/source/core/data/colorscale.cxx|   10 ++-
 sc/source/core/data/fillinfo.cxx  |2 
 sc/source/filter/oox/condformatbuffer.cxx |5 -
 sc/source/ui/view/output.cxx  |   85 +++---
 6 files changed, 87 insertions(+), 28 deletions(-)

New commits:
commit b1ba05b2cc7bdbb21fb2a9626b029f0c46926ac4
Author: Markus Mohrhard 
Date:   Thu May 10 02:14:16 2012 +0200

Color Scales are now displayed after import from xlsx

It is still displayed at the wrong position but it looks promising.

Change-Id: I7ee55525cc219594635d81240f198b0a30c8707d

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index df65333..01ff306 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -55,6 +55,8 @@ private:
 typedef boost::ptr_vector ColorScaleEntries;
 ColorScaleEntries maColorScales;
 public:
+ScColorScaleFormat(ScDocument* pDoc);
+
 Color* GetColor(const ScAddress& rAddr) const;
 void AddEntry(ScColorScaleEntry* pEntry);
 
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 167e24a..a5786ba 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -31,7 +31,6 @@
 
 #include 
 #include "global.hxx"
-#include 
 
 class SfxItemSet;
 class SvxBrushItem;
@@ -69,7 +68,7 @@ struct CellInfo
 
 const ScPatternAttr*pPatternAttr;
 const SfxItemSet*   pConditionSet;
-boost::shared_ptrpColorScale;
+const Color*pColorScale;
 
 const SvxBrushItem* pBackground;
 
@@ -103,6 +102,14 @@ struct CellInfo
 
 sal_BoolbHideGrid : 1;  // 
output-internal
 sal_BoolbEditEngine : 1;// 
output-internal
+
+CellInfo():
+pColorScale(NULL) {}
+
+~CellInfo()
+{
+delete pColorScale;
+}
 };
 
 const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 787690d..f05afb0 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -54,6 +54,11 @@ const Color& ScColorScaleEntry::GetColor() const
 return maColor;
 }
 
+ScColorScaleFormat::ScColorScaleFormat(ScDocument* pDoc):
+mpDoc(pDoc)
+{
+}
+
 void ScColorScaleFormat::AddEntry( ScColorScaleEntry* pEntry )
 {
 maColorScales.push_back( pEntry );
@@ -99,7 +104,7 @@ Color* ScColorScaleFormat::GetColor( const ScAddress& rAddr 
) const
 // now we have for sure a value
 double nVal = mpDoc->GetValue(rAddr);
 
-if (!maColorScales.size() < 2)
+if (maColorScales.size() < 2)
 return NULL;
 
 const_iterator itr = begin();
@@ -109,13 +114,14 @@ Color* ScColorScaleFormat::GetColor( const ScAddress& 
rAddr ) const
 double nValMax = itr->GetValue();
 Color rColMax = itr->GetColor();
 
+++itr;
 while(itr != end() && nVal > nValMin)
 {
-++itr;
 rColMin = rColMax;
 nValMin = nValMax;
 rColMax = itr->GetColor();
 nValMax = itr->GetValue();
+++itr;
 }
 
 Color aColor = CalcColor(nVal, nValMin, rColMin, nValMax, rColMax);
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 8ad3dba..9d7fc2f 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -568,7 +568,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL 
nX1, SCROW nY1, SCCOL nX
 if ( pColorScale )
 {
 Color* pColor = pColorScale->GetColor( 
ScAddress( nX, nCurRow, nTab ) );
-pInfo->pColorScale.reset(pColor);
+pInfo->pColorScale = pColor;
 }
 
 ++nArrY;
diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index e189c75..8cc7778 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -61,8 +61,6 @@
 #include "docpool.hxx"
 #include "scitems.hxx"
 
-#include 
-
 namespace oox {
 namespace xls {
 
@@ -158,7 +156,6 @@ void ColorScaleRule::importValue( const AttributeList& 
rAttribs )
 {
 double nVal = rAttribs.getDouble( XML_val, 0.0 );
 maValues.push_back(nVal);
-std::cout << "ColorScaleRule::importValue: " << nVal << std::endl;
 }
 }
 
@@ -659,7 +656,7 @@ void CondFormatRule::finalizeImport( const Reference< 
XSheetConditionalEntries >
 else if( mpColor )
 {
 ScDocument& rDoc = getScDocument();
-ScColorScaleFormat* pFormat = new ScColorScaleFormat();
+ScColorScaleFormat* pFormat = new ScColorScaleFormat(&rDoc);
 
 mpColor->AddEntries( pFormat );
 sal_Int32 nIndex = rDoc.AddColorScaleForm

Re: Need help with debugging LO freeze

2012-05-09 Thread Tommy


O

n Thu, 03 May 2012 22:13:37 +0200, Daniel Naber   
wrote:



Hi,

I'm the author of LanguageTool, a style and grammar checker. We received  
a  lot of reports that LO freezes for several seconds if LanguageTool is

installed.


I remember also this issue you filed:   
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=46765



I have now debugged this and it seems the problem occurs with
LanguageTool but is actually in LO and will also affect other grammar
checkers.


interesting, maybe it affect the internal LibO spellchecker, right?


snip

In a nutshell: the freeze happens when SvxLinguConfigUpdate::UpdateAll()  
is

called because it's slow. If we turn on caching in
LngSvcMgr::getAvailableServices(), the freeze is gone. Any help is  
welcome.


snip


could you please take a look at it?
https://bugs.freedesktop.org/show_bug.cgi?id=46805
it's another issue about spellchecking freeze...

Micheal Meeks already patched a partial fix in master (-50% freeze time)
I wonder if your bugfix may help reducing the remaining 50% as a lucky  
side effect.

keeping my fingers crossed  :-)

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

Re: Proper process to follow when pushing to feature/gsoc-calc-perf

2012-05-09 Thread Kohei Yoshida

Hi Daniel,

On Wed, May 9, 2012 at 7:36 PM, Daniel Bankston
 wrote:
> Hi, Kohei and Markus,
>
> I understand that when dealing with the master branch, a contributing
> developer is supposed to send a patch to the mailing list with the subject
> prefixed with [PATCH].  What process should I follow when pushing to the
> feature/gsoc-calc-perf branch?  Should I notify you in some fashion or
> simply push at my discretion?  Is it ok to push several small commits,
> should I try to push only a few large commits, or push commits at my
> discretion?

You can push commits at your discretion as long as you are pushing
them to your own feature branch.  You can also choose to post a patch
to the mailing list if you are not sure, but that's not required.  As
far as whether to make small commits or large ones, that's also up to
you.  We normally recommend you make smaller commits as opposed to
larger ones, but sometimes you need to make a large change so it also
depends on the kind of change you are making.  A good rule of thumb is
to make each commit have a distinct purpose, and that make each commit
buildable.  But that's just a guideline and certainly subject to
exceptions.

Hope that clarifies things a bit.

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

Re: Proper process to follow when pushing to feature/gsoc-calc-perf

Hello Daniel,


> I understand that when dealing with the master branch, a contributing
> developer is supposed to send a patch to the mailing list with the subject
> prefixed with [PATCH].  What process should I follow when pushing to the
> feature/gsoc-calc-perf branch?  Should I notify you in some fashion or
> simply push at my discretion?

For me it is ok if you just push to your branch without writing a mail to me.

> Is it ok to push several small commits,
> should I try to push only a few large commits, or push commits at my
> discretion?

I think this is mostly up to you. Personally I prefer smaller commits
because they make it easier to review and find errors in them but I#m
not always following it myself.

> I am sorry if these questions seem silly; I am only trying to
> avoid potential hassle.

Don't worry. It is perfectly fine to ask such questions.

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

Proper process to follow when pushing to feature/gsoc-calc-perf

2012-05-09 Thread Daniel Bankston


Hi, Kohei and Markus,

I understand that when dealing with the master branch, a contributing 
developer is supposed to send a patch to the mailing list with the 
subject prefixed with [PATCH].  What process should I follow when 
pushing to the feature/gsoc-calc-perf branch?  Should I notify you in 
some fashion or simply push at my discretion?  Is it ok to push several 
small commits, should I try to push only a few large commits, or push 
commits at my discretion?  I am sorry if these questions seem silly; I 
am only trying to avoid potential hassle.


Respectfully,
Daniel Bankston
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement

2012-05-09 Thread Luke Symes

Hi, just posting a license statement for my contributions to LibreOffice:

All of my past & future contributions to LibreOffice may be licensed under
the MPL/LGPLv3+ dual license.

Kind regards,

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

Re: [PUSHED-3-5] Revert "Set the listbox height to an integer multiple of the listbox entry height"

2012-05-09 Thread Jean-Baptiste Faure

Hi,

Le 09/05/2012 13:52, Ivan Timofeev a écrit :
> [...]
>
> Opinions from the UX point of view? :) Do we really need to shrink a
> listbox so that it does not show a partially visible item at the
> bottom,[...]?
A partially visible item at the bottom of a listbox, shows clearly that
there is something else to see. It is a useful information.
In the case of the Navigator or the Stylist, shrinking the listbox has
very unsightly effects when you resize the window, particularly when
they are docked, one above the other, on the side of the main window.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

License statement from Greg Kroah-Hartman

2012-05-09 Thread Greg KH

In case it needed to be cleared up:

All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

thanks,

greg k-h

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

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

2012-05-09 Thread Kohei Yoshida

 sc/source/ui/unoobj/fielduno.cxx |  275 ---
 1 file changed, 231 insertions(+), 44 deletions(-)

New commits:
commit 7c99fff933a112044589874d91e226df8e0332fd
Author: Kohei Yoshida 
Date:   Wed May 9 15:24:16 2012 -0400

Access properties in the edit source when the field item is already 
inserted.

Change-Id: Idbc8b7fde425c1c14af27472a4850b290cf0a68c

diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 0bd3bf4..7bc82b7 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -898,31 +898,199 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const 
rtl::OUString& rName)
 
 void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, 
const uno::Any& rVal)
 {
-if (rName == SC_UNONAME_ISDATE)
-mbIsDate = rVal.get();
-else if (rName == SC_UNONAME_ISFIXED)
-mbIsFixed = rVal.get();
-else if (rName == SC_UNONAME_DATETIME)
-maDateTime = rVal.get();
-else if (rName == SC_UNONAME_NUMFMT)
-mnNumFormat = rVal.get();
+if (mpEditSource)
+{
+// Field already inserted.
+ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
+ScUnoEditEngine aTempEngine(pEditEngine);
+SvxFieldData* pField = aTempEngine.FindByPos(aSelection.nStartPara, 
aSelection.nStartPos, meType);
+if (!pField)
+return;
+
+switch (meType)
+{
+case text::textfield::Type::DATE:
+{
+SvxDateField* p = static_cast(pField);
+if (rName == SC_UNONAME_ISDATE)
+{
+// Do nothing for now.
+}
+else if (rName == SC_UNONAME_ISFIXED)
+{
+SvxDateType eType = rVal.get() ? SVXDATETYPE_FIX 
: SVXDATETYPE_VAR;
+p->SetType(eType);
+}
+else if (rName == SC_UNONAME_DATETIME)
+{
+maDateTime = rVal.get();
+Date aDate(maDateTime.Day, maDateTime.Month, 
maDateTime.Year);
+p->SetFixDate(aDate);
+}
+else if (rName == SC_UNONAME_NUMFMT)
+{
+mnNumFormat = rVal.get();
+p->SetFormat(static_cast(mnNumFormat));
+}
+else
+throw beans::UnknownPropertyException();
+}
+break;
+case text::textfield::Type::TIME:
+{
+// SvxTimeField doesn't have any attributes.
+if (rName != SC_UNONAME_ISDATE && rName != SC_UNONAME_ISFIXED 
&&
+rName != SC_UNONAME_DATETIME && rName != SC_UNONAME_NUMFMT)
+throw beans::UnknownPropertyException();
+}
+break;
+case text::textfield::Type::EXTENDED_TIME:
+{
+SvxExtTimeField* p = static_cast(pField);
+if (rName == SC_UNONAME_ISDATE)
+{
+// Do nothing for now.
+}
+else if (rName == SC_UNONAME_ISFIXED)
+{
+SvxTimeType eType = rVal.get() ? SVXTIMETYPE_FIX 
: SVXTIMETYPE_VAR;
+p->SetType(eType);
+}
+else if (rName == SC_UNONAME_DATETIME)
+{
+maDateTime = rVal.get();
+Time aTime(maDateTime.Hours, maDateTime.Minutes, 
maDateTime.Seconds, maDateTime.HundredthSeconds);
+p->SetFixTime(aTime);
+}
+else if (rName == SC_UNONAME_NUMFMT)
+{
+mnNumFormat = rVal.get();
+p->SetFormat(static_cast(mnNumFormat));
+}
+else
+throw beans::UnknownPropertyException();
+}
+break;
+default:
+throw beans::UnknownPropertyException();
+}
+}
 else
-throw beans::UnknownPropertyException();
+{
+if (rName == SC_UNONAME_ISDATE)
+mbIsDate = rVal.get();
+else if (rName == SC_UNONAME_ISFIXED)
+mbIsFixed = rVal.get();
+else if (rName == SC_UNONAME_DATETIME)
+maDateTime = rVal.get();
+else if (rName == SC_UNONAME_NUMFMT)
+mnNumFormat = rVal.get();
+else
+throw beans::UnknownPropertyException();
+}
 }
 
 uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName)
 {
-if (rName == SC_UNONAME_ISDATE)
-return uno::makeAny(mbIsDate);
+if (mpEditSource)
+{
+// Field already inserted.
+ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
+ScUnoEditEngine aTempEngine(pEditEngine);
+SvxFieldData* pField = aTempEngi

3.5.3rc1 win32 / debug package ...

Hi there,

Trying to get a good stack trace from vcl, I downloaded 3.5.3rc1 from:

http://dev-builds.libreoffice.org/win32-debug/libreoffice-3-5/

I get a beautiful crash in the MSVC++ debugger, but no symbols; I try
to add vcllo.pdb from LOdev 3.5\program and it moans: "The symbol file
vcllo.pdb does not match the module."

Thoughts ? incompetence unwinds ? it's somewhat frustrating to have a
nice, repeatable, null-pointer-dereference crasher and no way of finding
where it is ;-)

Thanks,

Michael.

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

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

Re: {PATCH] fdo#44456 added calc function DATEDIF as in ODF 1.2

Hi Winfried,

On Wednesday, 2012-05-09 16:49:41 +0200, Winfried Donkers wrote:

> Attached patch adds function DATEDIF to calc as defined in ODF1.2 (6.10.3)

Hey, great! I'll dive into that tomorrow (or the day after..)

  Eike

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


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

Re: italic display of regular fonts in menu

2012-05-09 Thread Steve White

Hi Caolán,

Thanks for the explanation!

It is a bit of a bug though.  There is a a convention for finding the
"regular" face of a family, discussed in the TrueType and OpenType
standards.
That is a mess, but it mostly works.

The reason I asked, was that there is a Windows bug, triggered by a
mismatch between the header "weight" and the OS/2 "weight",
which produced similar-looking effects -- except there the regular
face couldn't be used at all.  I thought there might be a connection,
but evidently there isn't.

Cheers!

On Wed, May 9, 2012 at 5:41 PM, Caolán McNamara  wrote:
> On Tue, 2012-04-24 at 14:38 +0200, Steve White wrote:
>> Hi!
>>
>> Can anybody tell me why the names of a few font families, which have
>> regular, italic, bold, and oblique styles, appears in the Writer's
>> font list in italics?
>>
>> The affected fonts include
>>  "Century Schoolbook L", TLWGMono, "URW Palladio L"
>
> svtools/source/control/ctrltool.cxx ImplCompareFontInfo take every font
> face with the same name and orders them by weight first, and then
> posture. The font dropdown renders the first in that list. Those fonts
> have Italic faces of weight 80 while their "Normal"/"Roman" faces are of
> weight 100, so the italics get sorted first in the list.
>
> The same ordering is used for format->character, there'll you see for
> e.g. "Century Schoolbook L" that the styles are in order of Italic,
> Roman while for e.g. Gentium Basic they're in order Regular, Italic
>
> I've changed this now with
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=c7a9318f08e08a35f2784bf8d06f62031649b24e
>  so the dropdown should show an upright, where available, face now
>
> C.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

ODF proposal for element (was: support for repeating format code in calc)

Hi,

On Tuesday, 2012-04-24 21:31:41 +0200, Eike Rathke wrote:

> Given that I think we'd need a number:fill-character or some such
> attribute to go with
> 16.27 Data Styles
> http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part1.html#__RefHeading__1416346_253892949
> with the limitation that it can be present only once (if that is what
> Excel does) and specyfing what happens in these three conditions.

Taking
http://wiki.oasis-open.org/office/How_to_propose_a_change_or_addition_to_ODF
http://wiki.oasis-open.org/office/ProposalTemplate
here is what I could come up with.

Noel, Kohei: did I miss anything? Is that what Excel does, specifically
the adjustment described? All elements covered where it
can occur?

Thorsten: if fine could you then please submit that to the TC, create
a JIRA issue and whatever is required? Thanks.

---%<---snip---%<---

Proposal owner:
Thorsten Behrens

Proposal short name:
element for data styles

Rationale
~

Use cases:
For interoperability with other spreadsheet implementations an
additional attribute is needed to specify a fill character used to fill
space between grid border and content, or separating two parts of
a displayed value string and filling in with the character.

Alternatives considered:
None.

Requested changes to the ODF Standard
~

Text changes/additions:
In section
16.27 Data Styles
http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part1.html#__RefHeading__1416346_253892949
add:

The content of this element specifies a Unicode character that is
displayed repeatedly at the position where it occurs.

There are three possible positions for this element, resulting in
display strings as follows:
* Start of style:
* Right adjusts the display string and fills available space with the
character specified from the left cell grid border up to the display
string.
* End of style:
* Left adjusts the display string and fills available space with the
character specified from the display string up to the right cell
grid border.
* Within style:
* Splits the display string in two at the position where the element
occurs, first part becomes left justified, second part becomes right
justified, the available space in between is filled with the
character specified.

The element is usable within the following
elements:
[these lists are generated from the schema IIRC]

[and list the element as a child element of each
of those]

Schema changes/additions:

New element:

Add to each

this

Impacts
~~~

Conformance:
A processor may ignore this element, for example if there is no cell
grid available or in data processing.

Backwards compatibility:
This element was not available in previous versions and is optional.
Existing ODF processors may ignore it.

Accessibility impact:
None.

---%<---snap---%<---

Hopefully that does it..

Eike

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

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-05-09 Thread bugzilla-daemon

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on|49350   |

-- 
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: [PATCH] confusion with overlapping grammar errors

On 08/05/12 21:18, Daniel Naber wrote:
> Hi,
> 
> I was asked to post my patch from
> https://bugs.freedesktop.org/show_bug.cgi?id=49605 here:
> 
> Problem: having two grammar errors that partly overlap confuses writer, it 
> will show the same error message for both. I think that's because only the 
> first error is considered, as the error's end position is ignored. The 
> attached patch seems to fix this.
> 
> See the issue for a description of how to reproduce this. Feedback is 
> welcome.

hi Daniel,

don't know much about this linguistic stuff, but your change looks
plausible, or at least the existing code looks wrong in case of
overlaps, so i've pushed your patch to master now.

could you please confirm that you contribute this patch under
MPL/LGPLv3+ license?

the best way is to send a blanket mail to this list with the license for
all your past and future contributions to LO, add yourself to this wiki
page and add a link to that mail in the wiki page:

http://wiki.documentfoundation.org/Development/Developers
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

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

New commits:
commit 1616759f49b2c2065a6404d16bee31dab9afa7f0
Author: Daniel Naber 
Date:   Wed May 9 20:39:40 2012 +0200

fdo#49605: SwEditShell: fix handling of overlapping grammar errors

diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 96ca627..e95f967 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1160,7 +1160,7 @@ bool SwEditShell::GetGrammarCorrection(
 // return suggestions for first error that includes the 
given error position
 const linguistic2::SingleProofreadingError &rError = 
rResult.aErrors[i];
 if (rError.nErrorStart <= rErrorPosInText &&
-rErrorPosInText < rError.nErrorStart + 
rError.nErrorLength)
+rErrorPosInText + nLen <= rError.nErrorStart + 
rError.nErrorLength)
 {
 rSuggestions = rError.aSuggestions;
 rErrorIndexInResult = i;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/submodules'

2012-05-09 Thread Norbert Thiebaud

New branch 'feature/submodules' available with the following commits:
commit 7dc407c4ab412c76adff353a578a6e4b38f4115b
Author: Norbert Thiebaud 
Date:   Fri Mar 9 12:44:58 2012 -0600

submodule: convert help binfilter dictionaries and translations

Change-Id: I9fb6a251d0c220baeec6cb1f057e22105f4ff736

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-05-09 Thread Norbert Thiebaud

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

Re: [PUSHED][PATCH] - WKS date format bug fix ...

Hi Urmas,

On Wed, 2012-05-09 at 17:42 +0200, Eike Rathke wrote:
> > On Tue, May 8, 2012 at 4:31 PM, Michael Meeks  
> > wrote:
> > > Nice fix:
> > >
> > >https://bugs.freedesktop.org/show_bug.cgi?id=44738
> > > malingering as:
> > >https://bugs.freedesktop.org/attachment.cgi?id=56998
...
> Pushed to master with
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b8d8ab30305212c3606d9218f1e017132d4772b

So - of course, we really need a real name; and also a blanket
MPL/LGPLv3+ license statement that we can link into:

http://wiki.documentfoundation.org/Development/Developers

Can you provide that ?

Thanks,

Michael.

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

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

[PUSHED] Re: [PATCH] cups configure switch

2012-05-09 Thread Tomáš Chvátal

So I went ahead and pushed my version of the patch.

Test and break things!

Cheers

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

Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_

On 09/05/12 19:12, Lubos Lunak wrote:
>  Commit f4f4e3c050b117a8bfaa95a865b3b37bcb637516 now breaks build on the 
> Win-x86_6-fast tinderbox, see e.g. 
> http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1336580405.5265#err175
>  .
> 
> With verbose debug, one error looks like this:
> 
> $ make
> [ build CXX ] writerfilter/source/doctok/WW8FontTable.cxx
> make[1]: Entering directory `/home/tinderbox/libreoffice/writerfilter'
> S=C:/cygwin/home/tinderbox/libreoffice && O=$S/solver/wntmsci12.pro && 
> W=$S/workdir/wntmsci12.pro &&  mkdir -p 
> $W/CxxObject/writerfilter/source/doctok/ 
> $W/Dep/CxxObject/writerfilter/source/doctok/ 
> &&  /cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe -DBOOST_MEM_FN_ENABLE_CDECL 
> -DCPPU_ENV=msci -DENABLE_GRAPHITE -DENABLE_GTK -DINTEL -DM1500 -DMSC -DNDEBUG 
> -DNOMINMAX -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DSOLAR_JAVA -DSUPD=360 -DWIN32 
> -DWINVER=0x0500 -DWNT -D_CRT_NONSTDC_NO_DEPRECATE 
> -D_CRT_NON_CONFORMING_SWPRINTFS -D_CRT_SECURE_NO_DEPRECATE -D_DLL -D_MT 
> -D_REENTRANT -D_WIN32_IE=0x0500 -D_X86_=1  -D_DLL  
> -DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION   -Gd -GR -Gs -GS -Gy -MD -nologo 
> -Wall -wd4005 -wd4061 -wd4127 -wd4180 -wd4189 -wd4191 -wd4217 -wd4242 -wd4244 
> -wd4245 -wd4250 -wd4251 -wd4265 -wd4275 -wd4290 -wd4294 -wd4350 -wd4355 
> -wd4365 -wd4503 -wd4505 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4619 
> -wd4625 -wd4626 -wd4640 -wd4668 -wd4675 -wd4686 -wd4692 -wd4706 -wd4710 
> -wd4711 -wd4373 -wd4738 -wd4786 -wd4800 -wd4820 -wd4826 -wd4917 -wd4996 
> -Zc:forScope,wchar_t- -Zm500   -DEXCEPTIONS_ON -EHa  -Ob1 -Oxs -Oy-  
> -Fd$W/LinkTarget/pdb/Library/idoctok.lib.pdb  -I$S/writerfilter/source/docto
 k/  -I$O/
inc/external -I$O/inc -I$S/solenv/inc 
-IC:/PROGRA~2/Java/JDK15~1.0_2/include/win32 
-IC:/PROGRA~2/Java/JDK15~1.0_2/include 
-IC:/PROGRA~1/MICROS~3/Windows/v7.1/include -IC:/PROGRA~2/MICROS~1.0/VC/include 
-IC:/PROGRA~2/MI0FC3~1/include   -I$S/writerfilter/inc -I$S/writerfilter/source 
-I$S/writerfilter/source/doctok -I$W/CustomTarget/writerfilter/source 
-I$W/CustomTarget/writerfilter/source/ooxml 
-I$W/CustomTarget/writerfilter/source/doctok  
-I$W/UnoApiHeadersTarget/offapi/normal -I$W/UnoApiHeadersTarget/udkapi/normal  
-c 
> $S/writerfilter/source/doctok/WW8FontTable.cxx 
> -Fo$W/CxxObject/writerfilter/source/doctok/WW8FontTable.o
> cl : Command line error D8038 : invalid 
> argument 
> '-IC:/cygwin/home/tinderbox/libreoffice/solver/wntmsci12.pro/inc/external 
> -IC:/cygwin/home/tinderbox/libreoffice/solver/wntmsci12.pro/inc 
> -IC:/cygwin/home/tinderbox/libreoffice/solenv/inc 
> -IC:/PROGRA~2/Java/JDK15~1.0_2/include/win32 
> -IC:/PROGRA~2/Java/JDK15~1.0_2/include 
> -IC:/PROGRA~1/MICROS~3/Windows/v7.1/include 
> -IC:/PROGRA~2/MICROS~1.0/VC/include -IC:/PROGRA~2/MI0FC3~1/include   
> -IC:/cygwin/home/tinderbox/libreoffice/writerfilter/inc 
> -IC:/cygwin/home/tinderbox/libreoffice/writerfilter/source 
> -IC:/cygwin/home/tinderbox/libreoffice/writerfilter/source/doctok 
> -IC:/cygwin/home/tinderbox/libreoffice/workdir/wntmsci12.pro/CustomTarget/writerfilter/source
>  
> -IC:/cygwin/home/tinderbox/libreoffice/workdir/wntmsci12.pro/CustomTarget/writerfilter/source/ooxml
>  
> -IC:/cygwin/home/tinderbox/libreoffice/workdir/wntmsci12.pro/CustomTarget/writerfilter/source/doctok
>   
> -IC:/cygwin/home/tinderbox/libreoffice/workdir/wntmsci12.pro/UnoApiHeadersTarget/offapi/normal
>  -IC:/cygwin/home/tinde
 rbox/libr
eoffice/workdir/wntmsci12.pro/UnoApiHeadersTarget/udkapi/normal'
> make[1]: *** 
> [C:/cygwin/home/tinderbox/libreoffice/workdir/wntmsci12.pro/CxxObject/writerfilter/source/doctok/WW8FontTable.o]
>  
> Error 2
> make[1]: Leaving directory `/home/tinderbox/libreoffice/writerfilter'
> 
> 
>  I don't understand what the actual problem is, because if I copy&paste the 
> command and run it manually, it works without problems. I've also checked the 
> arguments passed to cl.exe and they seem to be split properly (attached).

rats, very puzzling indeed... and why only for this file? no idea what
that could be, this problem needs some experimenting locally.
can you try to hack around with the compile command in WNT_MSC_foo.mk to
see where it comes from?   (the part it complains about is $(INCLUDE)
obviously)

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

Re: Need help with debugging LO freeze

2012-05-09 Thread Daniel Naber

On Mittwoch, 9. Mai 2012, Michael Meeks wrote:

Hi Michael,

>   Daniel - thanks for doing some great research here - what's your
> preferred fix ? any chance of a patch for that so we can give credit
> where it is due ? [ or do you want me to go wild in that general area -
> a bonus of doing it yourself is that I can sign it off for
> 3.5. ;-]

thanks for your help. My "patch" would just be to comment out the one line 
of cache cleaning. As you found other places that can be refactored as 
well, I'd be grateful if you care about this issue...

Regards
 Daniel

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

[Libreoffice-commits] .: svtools/source

 svtools/source/control/ctrltool.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit df45d9d1c037b27291c2173c4d0bfa6e3a42a73f
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed May 9 19:19:11 2012 +0200

work around -Wreturn-type with compilers that cannot figure it out 
themselves

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index ffa4fbb..8561167 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -126,12 +126,11 @@ private:
 //sort normal to the start
 static int sortWeightValue(FontWeight eWeight)
 {
-if (eWeight == WEIGHT_NORMAL)
-return 0;
 if (eWeight < WEIGHT_NORMAL)
 return eWeight + 1;
 if (eWeight > WEIGHT_NORMAL)
 return eWeight - 1;
+return 0; // eWeight == WEIGHT_NORMAL
 }
 
 static StringCompare ImplCompareFontInfo( ImplFontListFontInfo* pInfo1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] .: 2 commits - accessibility/CustomTarget_bridge_inc.mk configure.in extensions/CustomTarget_so_activex_idl.mk extensions/Library_so_activex.mk extensions/Library_so_activex_

On Wednesday 09 of May 2012, Noel Power wrote:
>  Makefile  |   20 ++--
>  accessibility/CustomTarget_bridge_inc.mk  |2 -
>  configure.in  |3 +
>  extensions/CustomTarget_so_activex_idl.mk |2 -
>  extensions/Library_so_activex.mk  |2 -
>  extensions/Library_so_activex_x64.mk  |2 -
>  extensions/WinResTarget_activex.mk|2 -
>  filter/Configuration_filter.mk|   14 
>  filter/CustomTarget_svg.mk|2 -
>  i18npool/CustomTarget_breakiterator.mk|8 ++---
>  i18npool/CustomTarget_collator.mk |2 -
>  i18npool/CustomTarget_indexentry.mk   |2 -
>  i18npool/CustomTarget_localedata.mk   |4 +-
>  i18npool/CustomTarget_textconversion.mk   |2 -
>  jvmfwk/CustomTarget_jreproperties.mk  |2 -
>  officecfg/CustomTarget_registry.mk|2 -
>  packimages/CustomTarget_images.mk |8 ++---
>  ridljar/CustomTarget_javamaker.mk |2 -
>  sal/CustomTarget_generated.mk |2 -
>  solenv/bin/build.pl   |   12 ---
>  solenv/gbuild/AllLangResTarget.mk |6 +--
>  solenv/gbuild/BuildDirs.mk|   47
> -- solenv/gbuild/ComponentTarget.mk  | 
>   2 -
>  solenv/gbuild/ComponentsTarget.mk |   12 +++
>  solenv/gbuild/Configuration.mk|   10 +++---
>  solenv/gbuild/CppunitTest.mk  |2 -
>  solenv/gbuild/Extension.mk|6 +--
>  solenv/gbuild/Helper.mk   |   16 +-
>  solenv/gbuild/InternalUnoApi.mk   |2 -
>  solenv/gbuild/Jar.mk  |2 -
>  solenv/gbuild/JavaClassSet.mk |5 +--
>  solenv/gbuild/JunitTest.mk|2 -
>  solenv/gbuild/Rdb.mk  |4 +-
>  solenv/gbuild/SdiTarget.mk|2 -
>  solenv/gbuild/UnoApi.mk   |2 -
>  solenv/gbuild/UnoApiTarget.mk |   18 +--
>  solenv/gbuild/Zip.mk  |4 +-
>  solenv/gbuild/gbuild.mk   |3 -
>  solenv/gbuild/platform/WNT_INTEL_MSC.mk   |   27 +++--
>  solenv/gbuild/platform/com_GCC_defs.mk|1
>  unoil/CustomTarget_climaker.mk|6 +--
>  unoil/CustomTarget_javamaker.mk   |2 -
>  writerfilter/CustomTarget_source.mk   |   38 
>  43 files changed, 114 insertions(+), 200 deletions(-)
>
> New commits:

 Commit f4f4e3c050b117a8bfaa95a865b3b37bcb637516 now breaks build on the 
Win-x86_6-fast tinderbox, see e.g. 
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1336580405.5265#err175
 .

With verbose debug, one error looks like this:

$ make
[ build CXX ] writerfilter/source/doctok/WW8FontTable.cxx
make[1]: Entering directory `/home/tinderbox/libreoffice/writerfilter'
S=C:/cygwin/home/tinderbox/libreoffice && O=$S/solver/wntmsci12.pro && 
W=$S/workdir/wntmsci12.pro &&  mkdir -p 
$W/CxxObject/writerfilter/source/doctok/ 
$W/Dep/CxxObject/writerfilter/source/doctok/ 
&&  /cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe -DBOOST_MEM_FN_ENABLE_CDECL 
-DCPPU_ENV=msci -DENABLE_GRAPHITE -DENABLE_GTK -DINTEL -DM1500 -DMSC -DNDEBUG 
-DNOMINMAX -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DSOLAR_JAVA -DSUPD=360 -DWIN32 
-DWINVER=0x0500 -DWNT -D_CRT_NONSTDC_NO_DEPRECATE 
-D_CRT_NON_CONFORMING_SWPRINTFS -D_CRT_SECURE_NO_DEPRECATE -D_DLL -D_MT 
-D_REENTRANT -D_WIN32_IE=0x0500 -D_X86_=1  -D_DLL  
-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION   -Gd -GR -Gs -GS -Gy -MD -nologo -Wall 
-wd4005 -wd4061 -wd4127 -wd4180 -wd4189 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 
-wd4250 -wd4251 -wd4265 -wd4275 -wd4290 -wd4294 -wd4350 -wd4355 -wd4365 -wd4503 
-wd4505 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4619 -wd4625 -wd4626 -wd4640 
-wd4668 -wd4675 -wd4686 -wd4692 -wd4706 -wd4710 -wd4711 -wd4373 -wd4738 -wd4786 
-wd4800 -wd4820 -wd4826 -wd4917 -wd4996 -Zc:forScope,wchar_t- -Zm500   
-DEXCEPTIONS_ON -EHa  -Ob1 -Oxs -Oy-  
-Fd$W/LinkTarget/pdb/Library/idoctok.lib.pdb  -I$S/writerfilter/source/doctok/  
-I$O/inc/external -I$O/inc -I$S/solenv/inc 
-IC:/PROGRA~2/Java/JDK15~1.0_2/include/win32 
-IC:/PROGRA~2/Java/JDK15~1.0_2/include 
-IC:/PROGRA~1/MICROS~3/Windows/v7.1/include -IC:/PROGRA~2/MICROS~1.0/VC/include 
-IC:/PROGRA~2/MI0FC3~1/include   -I$S/writerfilter/inc -I$S/writerfilter/source 
-I$S/writerfilter/source/doctok -I$W/CustomTarget/writerfilter/source 
-I$W/CustomTarget/writerfilter/source/ooxml 
-I$W/CustomTarget/writerfilter/source/doctok  
-I$W/UnoApiHeadersTarget/offapi/normal -I$W/UnoApiHeadersTarget/udkapi/normal  
-c 
$S/writerfilter/source/doctok/WW8FontTable.cxx 
-Fo$W/CxxObject/writerfilter/source/doctok/WW8FontTable.o
cl : Command line error D8038 : invalid 
argument 
'-IC:/cygwin/home/tinderbox/libreoffice/solver/wntmsci12.pro/inc/external 
-IC:/cygwin/home/tinderbox/libreoffice/sol

Re: [REVIEW 3-5] calc import filters sometimes get shape positions badly wrong ( fdo##49430 )

2012-05-09 Thread Noel Power


On 09/05/12 16:48, Eike Rathke wrote:

Hi Noel,

On Tuesday, 2012-05-08 06:10:01 -0600, Noel Power wrote:


I tried with 3.4.5 and there the objects are imported to the correct row
and also survive save/reload (except that row heights are saved wrongly
also there),

oh :-/ now that is strange 'cause the problem ( xlsx import ) was
originally reported against 3.4.x, I tacked on the xls support as I saw
the same position misbehaviour in 3.5. So... it seems at least from what
you are saying that something nasty has happened with xls import post
3.4

Yup, I only tried with the .xls file that worked fine in 3.4.5

But as seen on IRC you found what's going wrong where...


I'm hesitating to push your patch because it changes behavior such that
after import it looks ok but saving messes things up so may go
unnoticed. Before at least it was clearly visible that something's wrong
;-)

hmm, not sure I totally agree, but how about just enabling this for oox
import then, I think that in all cases there is an improvement with that
right ? would that be ok?
I'm still hoping you'll find the real fix ;-)

[...]

Currently for 3.5 xlsx import I think this *is* the real fix ( or best 
option at least ), e.g. position the shapes absolutely using the same 
calculation ScDataView uses and should positively ensure that the 
absolute position matches where the row/col will be drawn and do this 
just for xlsx alone.


For master I want to be a little more adventurous in the way of getting 
rid of the 2/3 differently calculations of shapeposition, try eliminate 
the anchor/shape skew and for the import filters try to use cell 
anchoring where appropriate etc. If I come up with something for master 
we can look at the suitability of such a broader solution for 3.5 to 
replace the above, make sense ?


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

[Libreoffice-commits] .: vcl/win

 vcl/win/source/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f21316fbf0176ee23999504ce03917caac190cb3
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed May 9 18:20:23 2012 +0200

conversion to void* needs an explicit cast

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 72f9cf3..b2a24a7 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1081,7 +1081,7 @@ static bool InitUSP()
 {
 // get the usp10.dll version info
 HMODULE usp10 = ::GetModuleHandle("usp10.dll");
-void *pScriptIsComplex = ::GetProcAddress(usp10, "ScriptIsComplex");
+void *pScriptIsComplex = reinterpret_cast< void* >( 
::GetProcAddress(usp10, "ScriptIsComplex"));
 int nUspVersion = 0;
 rtl_uString* pModuleURL = NULL;
 osl_getModuleURLFromAddress( pScriptIsComplex, &pModuleURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-5] calc import filters sometimes get shape positions badly wrong ( fdo##49430 )

Hi Noel,

On Tuesday, 2012-05-08 06:10:01 -0600, Noel Power wrote:

> > I tried with 3.4.5 and there the objects are imported to the correct row
> > and also survive save/reload (except that row heights are saved wrongly
> > also there),
> oh :-/ now that is strange 'cause the problem ( xlsx import ) was
> originally reported against 3.4.x, I tacked on the xls support as I saw
> the same position misbehaviour in 3.5. So... it seems at least from what
> you are saying that something nasty has happened with xls import post
> 3.4

Yup, I only tried with the .xls file that worked fine in 3.4.5

But as seen on IRC you found what's going wrong where...

> > I'm hesitating to push your patch because it changes behavior such that
> > after import it looks ok but saving messes things up so may go
> > unnoticed. Before at least it was clearly visible that something's wrong
> > ;-)
> hmm, not sure I totally agree, but how about just enabling this for oox
> import then, I think that in all cases there is an improvement with that
> right ? would that be ok? 
> > 
> > Would be good if you could find the cause of the jumping around when
> > saving/reloading, and why row heights aren't saved properly.
> 
> looks like row heights were broken for some time, just at this minute
> that's less critical ( and not sure even where to start look for that )
> I hope to try and find out why the xls import/export causes such grief
> now first.

I'm still hoping you'll find the real fix ;-)

  Eike

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


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

Re: Need help with debugging LO freeze

2012-05-09 Thread Stephan Bergmann


On 05/09/2012 02:53 PM, Michael Meeks wrote:

I guess; in general it'd be rather nice to have a nice, pretty, boost
"UNO components changed" signal - that denotes that a new component has
been installed / removed - so we could throw away some of these
caches :-) Stephan - is there anything like that, that we could hook ?


For this case (which I haven't looked into too deeply), it would 
probably be nice if the component context's service manager had an 
interface that allowed signalling whenever the result of 
XContentEnumerationAccess.createContentEnumeration(N) for a given name N 
would change (i.e., whenever components implementing service N are 
added/removed).


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

Re: [PUSHED][PATCH] - WKS date format bug fix ...

Hi,

On Tuesday, 2012-05-08 16:39:10 -0400, Kohei Yoshida wrote:

> On Tue, May 8, 2012 at 4:31 PM, Michael Meeks  wrote:
> > Nice fix:
> >
> >        https://bugs.freedesktop.org/show_bug.cgi?id=44738
> > malingering as:
> >        https://bugs.freedesktop.org/attachment.cgi?id=56998
> 
> I think Eike would be the better person to review this (date parsing,
> number formatting, in German locale).  Putting him in CC.

Pushed to master with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b8d8ab30305212c3606d9218f1e017132d4772b

However, setting the same fixed format code strings for every locale was
wrong anyway, so changed that with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=cb7ff0d3801868d6ed7ba9be79095cdce9e29915

Thanks
  Eike

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


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

Re: italic display of regular fonts in menu

On Tue, 2012-04-24 at 14:38 +0200, Steve White wrote:
> Hi!
> 
> Can anybody tell me why the names of a few font families, which have
> regular, italic, bold, and oblique styles, appears in the Writer's
> font list in italics?
> 
> The affected fonts include
>  "Century Schoolbook L", TLWGMono, "URW Palladio L"

svtools/source/control/ctrltool.cxx ImplCompareFontInfo take every font
face with the same name and orders them by weight first, and then
posture. The font dropdown renders the first in that list. Those fonts
have Italic faces of weight 80 while their "Normal"/"Roman" faces are of
weight 100, so the italics get sorted first in the list.

The same ordering is used for format->character, there'll you see for
e.g. "Century Schoolbook L" that the styles are in order of Italic,
Roman while for e.g. Gentium Basic they're in order Regular, Italic

I've changed this now with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c7a9318f08e08a35f2784bf8d06f62031649b24e
 so the dropdown should show an upright, where available, face now

C.

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

[Libreoffice-commits] .: config_host.mk.in configure.in vcl/Library_vcl.mk vcl/null vcl/unx

2012-05-09 Thread Tomáš Chvátal

 config_host.mk.in |1 +
 configure.in  |   12 
 vcl/Library_vcl.mk|9 +++--
 vcl/null/printerinfomanager.cxx   |   10 ++
 vcl/unx/generic/printer/ppdparser.cxx |2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)

New commits:
commit 27abb730b290f3516582d2d787ef64af76663f97
Author: Tomas Chvatal 
Date:   Mon May 7 13:46:09 2012 +0200

Enable configure switch for cups

This allows us not to have cups during the build time of libreoffice.

Commit is inspired from patch from Dave Flogeras .

Change-Id: I I32a14eb6e7bdd13de1a737d4798c852a830ae326

diff --git a/config_host.mk.in b/config_host.mk.in
index d4a5ea6..0adc5fe 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -98,6 +98,7 @@ export DPKG=@DPKG@
 export DYNAMIC_CRT=@DYNAMIC_CRT@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
+export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DEBUG_FOR=@ENABLE_DEBUG_FOR@
 export ENABLE_DIRECTX=@ENABLE_DIRECTX@
diff --git a/configure.in b/configure.in
index 73f2c48..b09a935 100644
--- a/configure.in
+++ b/configure.in
@@ -848,6 +848,11 @@ AC_ARG_ENABLE(nsplugin,
 [Do not build nsplugin extension for browser embedding.])
 )
 
+AC_ARG_ENABLE(cups,
+AS_HELP_STRING([--disable-cups],
+[Do not build cups support.])
+)
+
 AC_ARG_ENABLE(ccache,
 AS_HELP_STRING([--disable-ccache],
 [Do not try to use ccache automatically.
@@ -3605,6 +3610,13 @@ fi
 
 dnl check for cups support
 dnl ===
+if test "$enable_cups" = "no"; then
+test_cups=no
+ENABLE_CUPS="NO"
+else
+ENABLE_CUPS="YES"
+fi
+AC_SUBST(ENABLE_CUPS)
 if test "$test_cups" = "yes"; then
 AC_MSG_CHECKING([whether cups support is present])
 AC_CHECK_LIB([cups], [cupsPrintFiles], [:])
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9a259c3..a5b1848 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -445,10 +445,15 @@ $(eval $(call gb_Library_add_defs,vcl,\
 $(eval $(call gb_Library_add_exception_objects,vcl,\
$(vcl_generic_code) \
 vcl/unx/generic/plugadapt/salplug \
-vcl/unx/generic/printer/cupsmgr \
 vcl/unx/generic/printer/jobdata \
 vcl/unx/generic/printer/ppdparser \
-vcl/unx/generic/printer/printerinfomanager \
+$(if $(filter YES,$(ENABLE_CUPS)),\
+vcl/unx/generic/printer/cupsmgr \
+vcl/unx/generic/printer/printerinfomanager \
+) \
+$(if $(filter NO,$(ENABLE_CUPS)),\
+vcl/null/printerinfomanager \
+) \
 ))
 $(eval $(call gb_Library_use_externals,vcl,\
fontconfig \
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 526a936..d606c41 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -84,6 +84,16 @@ void PrinterInfoManager::initialize()
 // ???
 }
 
+bool PrinterInfoManager::isCUPSDisabled() const
+{
+return m_bDisableCUPS;
+}
+
+void PrinterInfoManager::setCUPSDisabled( bool bDisable )
+{
+// cups is already disabled in config so do nothing
+}
+
 void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
 {
 rList.clear();
diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index e555396..9acee56 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
 PrinterInfoManager& rMgr = PrinterInfoManager::get();
 if( rMgr.getType() == PrinterInfoManager::CUPS )
 {
-#if !defined(ANDROID) && !defined(LIBO_HEADLESS)
+#if defined HAVE_CUPS_H
 pNewParser = 
const_cast(static_cast(rMgr).createCUPSParser( aFile 
));
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - lotuswordpro/source svtools/source

 lotuswordpro/source/filter/lwptablelayout.cxx |2 -
 lotuswordpro/source/filter/xfilter/xfutil.cxx |   45 +-
 svtools/source/control/ctrltool.cxx   |   24 ++---
 3 files changed, 50 insertions(+), 21 deletions(-)

New commits:
commit c7a9318f08e08a35f2784bf8d06f62031649b24e
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 16:33:58 2012 +0100

sort fonts so that upright faces are shown in the font dropdown list

Change font sort so that font faces like those of URW Palladio L whose 
italic
variant is lighter than its upright variant are sorted with the upright 
fonts
first so we don't see italic variants in the font widget.

Also sort "normal" weight faces below all other weights

Change-Id: I9c81b475d95b9dd17a873fd791b942512ff039c7

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index 3fdd515..ffa4fbb 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -123,19 +123,33 @@ private:
 {}
 };
 
-// ===
+//sort normal to the start
+static int sortWeightValue(FontWeight eWeight)
+{
+if (eWeight == WEIGHT_NORMAL)
+return 0;
+if (eWeight < WEIGHT_NORMAL)
+return eWeight + 1;
+if (eWeight > WEIGHT_NORMAL)
+return eWeight - 1;
+}
 
 static StringCompare ImplCompareFontInfo( ImplFontListFontInfo* pInfo1,
   ImplFontListFontInfo* pInfo2 )
 {
-if ( pInfo1->GetWeight() < pInfo2->GetWeight() )
+//Sort non italic before italics
+if ( pInfo1->GetItalic() < pInfo2->GetItalic() )
 return COMPARE_LESS;
-else if ( pInfo1->GetWeight() > pInfo2->GetWeight() )
+else if ( pInfo1->GetItalic() > pInfo2->GetItalic() )
 return COMPARE_GREATER;
 
-if ( pInfo1->GetItalic() < pInfo2->GetItalic() )
+//Sort normal weight to the start, followed by lightest to heaviest weights
+int nWeight1 = sortWeightValue(pInfo1->GetWeight());
+int nWeight2 = sortWeightValue(pInfo2->GetWeight());
+
+if ( nWeight1 < nWeight2 )
 return COMPARE_LESS;
-else if ( pInfo1->GetItalic() > pInfo2->GetItalic() )
+else if ( nWeight1 > nWeight2 )
 return COMPARE_GREATER;
 
 return pInfo1->GetStyleName().CompareTo( pInfo2->GetStyleName() );
commit e78b716035c42e4397524c04ff4db83944576bbb
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 14:43:27 2012 +0100

WaE: silence tedious msvc2008 warnings

Change-Id: Iecdc085b9af162ffdc6e0c52ad8a408a0983e088

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 5f9ae7e..ec05975 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1245,7 +1245,7 @@ void LwpTableLayout::ConvertColumn(XFTable 
*pXFTable,sal_uInt8 nStartCol,sal_uIn
 return;
 }
 
-for (sal_uInt16 iLoop = 0; iLoop < nEndCol-nStartCol ; iLoop ++)
+for (sal_uInt32 iLoop = 0; iLoop < 
static_cast(nEndCol)-nStartCol; ++iLoop)
 {
 // add row to table
 LwpObjectID *pColID = GetColumnLayoutHead();
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx 
b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 480482f..9eacb95 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -488,44 +488,59 @@ rtl::OUString   GetDrawKind(enumXFDrawKind kind)
 
 rtl::OUString   GetPageUsageName(enumXFPageUsage usage)
 {
+rtl::OUString sRet;
 switch(usage)
 {
 case enumXFPageUsageAll:
-return A2OUSTR("all");
+sRet = A2OUSTR("all");
+break;
 case enumXFPageUsageLeft:
-return A2OUSTR("left");
+sRet = A2OUSTR("left");
+break;
 case enumXFPageUsageRight:
-return A2OUSTR("right");
+sRet = A2OUSTR("right");
+break;
 case enumXFPageUsageMirror:
-return A2OUSTR("mirrored");
+sRet = A2OUSTR("mirrored");
+break;
 default:
-return A2OUSTR("mirrored");
+sRet = A2OUSTR("mirrored");
+break;
 }
-return A2OUSTR("");
+return sRet;
 }
 
 rtl::OUString   GetValueType(enumXFValueType type)
 {
+rtl::OUString sRet;
 switch(type)
 {
 case enumXFValueTypeBoolean:
-return A2OUSTR("boolean");
+sRet = A2OUSTR("boolean");
+break;
 case enumXFValueTypeCurrency:
-return A2OUSTR("currency");
+sRet = A2OUSTR("currency");
+break;
 case enumXFValueTypeDate:
-return A2OUSTR("date");
+sRet = A2OUSTR("date");
+break;
 case enumXFValueTypeFloat:
-return A2OUSTR("float");
+sRet = A2OUSTR("float");
+break;
 case enumXFValueTypePercentage:
-return A2OUSTR("percentage");
+sRet = A2OUSTR("percentage"

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

 sc/source/filter/lotus/tool.cxx |  115 
 1 file changed, 59 insertions(+), 56 deletions(-)

New commits:
commit cb7ff0d3801868d6ed7ba9be79095cdce9e29915
Author: Eike Rathke 
Date:   Wed May 9 17:25:36 2012 +0200

changes to fdo#44738 patch to make it work with other locales

Using some fixed format code for whatever locale is wrong anyway, use
NfIndexTableOffset and NfKeywordIndex instead. Probably those didn't exist
back at that time.

diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index b8928ea..3795b53 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -213,11 +213,11 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, 
sal_uInt8 nSt )
 // creates a new format
 sal_uInt8   nL, nH; // Low-/High-Nibble
 sal_uInt8   nForm = nFormat;
-String  aFormString;
-const sal_Char* pFormString = 0;
+String  aFormString;
 sal_Int16   eType = NUMBERFORMAT_ALL;
 sal_uInt32  nIndex1;
 sal_uInt32  nHandle;
+NfIndexTableOffset eIndexTableOffset = NF_NUMERIC_START;
 sal_BoolbDefault = false;
 //void GenerateFormat( aFormString, eType, COUNTRY_SYSTEM, LANGUAGE_SYSTEM,
 //  sal_Bool bThousand, sal_Bool IsRed, sal_uInt16 nPrecision, sal_uInt16 
nAnzLeading );
@@ -302,57 +302,61 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, 
sal_uInt8 nSt )
 case 0x02:  // Date: Day, Month, Year
 //fDate;dfDayMonthYearLong;
 eType = NUMBERFORMAT_DATE;
-pFormString = "DD.MM.";
+eIndexTableOffset = NF_DATE_SYS_DDMM;
 break;
 case 0x03:  // Date: Day, Month
 //fDate;dfDayMonthLong;
 eType = NUMBERFORMAT_DATE;
-pFormString = "DD.";
+aFormString = pFormTable->GetKeyword( eLanguage, 
NF_KEY_DD);
+aFormString += pFormTable->GetDateSep();// matches 
last eLanguage
+aFormString += pFormTable->GetKeyword( eLanguage, 
NF_KEY_);
 break;
 case 0x04:  // Date: Month, Year
 //fDate;dfMonthYearLong;
 eType = NUMBERFORMAT_DATE;
-pFormString = "MM.";
+aFormString = pFormTable->GetKeyword( eLanguage, 
NF_KEY_MM);
+aFormString += pFormTable->GetDateSep();// matches 
last eLanguage
+aFormString += pFormTable->GetKeyword( eLanguage, 
NF_KEY_);
 break;
 case 0x05:  // text format
 //fString;nSt;
 eType = NUMBERFORMAT_TEXT;
-pFormString = "@";
+eIndexTableOffset = NF_TEXT;
 break;
 case 0x06:  // hidden
 //wFlag |= paHideAll;bSetFormat = sal_False;
 eType = NUMBERFORMAT_NUMBER;
-pFormString = "";
+aFormString = "\"\"";
 break;
 case 0x07:  // Time: hour, min, sec
 //fTime;tfHourMinSec24;
 eType = NUMBERFORMAT_TIME;
-pFormString = "HH:MM:SS";
+eIndexTableOffset = NF_TIME_HHMMSS;
 break;
 case 0x08:  // Time: hour, min
 //fTime;tfHourMin24;
 eType = NUMBERFORMAT_TIME;
-pFormString = "HH:MM";
+eIndexTableOffset = NF_TIME_HHMM;
 break;
 case 0x09:  // Date, intern sal_Int32 1
 //fDate;dfDayMonthYearLong;
 eType = NUMBERFORMAT_DATE;
-pFormString = "DD.MM.";
+eIndexTableOffset = NF_DATE_SYS_DDMM;
 break;
 case 0x0A:  // Date, intern sal_Int32 2
 //fDate;dfDayMonthYearLong;
 eType = NUMBERFORMAT_DATE;
-pFormString = "DD.MM.";
+eIndexTableOffset = NF_DATE_SYS_DDMM;
 break;
 case 0x0B:  // Time, intern sal_Int32 1
 //fTime;tfHourMinSec24;
 eType = NUMBERFORMAT_TIME;
-pFormString = "HH:MM:SS";
+eIndexTableOffset = NF_TIME_HHMMSS;
 break;
 case 0x0C:  // Time, intern sal_Int32 2
 //fTime;tfHourMinSec24;
 eType = NUMBERFORMAT_TIME;
-pFormString = "HH:MM:SS";
+eIndexTableOffset = NF_TIME_HHMMSS;
 break;
 case 0x0F:  // standard
 //fStand

Re: [PUSHED-3-5] Hardcode cairo canvas off for Mac OS X and Windows

2012-05-09 Thread Korrawit Pruegsanusak

Hello Michael, Tor,

On Wed, May 9, 2012 at 6:20 PM, Michael Meeks  wrote:
>        I just cherry-picked the simple:

Thanks!

> I used you as a sign-off Korrawit - hope that's ok,

That's perfectly fine :-)

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

[Libreoffice-commits] .: configure.in

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 330d5185036638e4a54d73ab44884d31e6a986cc
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed May 9 17:22:00 2012 +0200

one more --enable-dbgutil typo

diff --git a/configure.in b/configure.in
index c471e34..73f2c48 100644
--- a/configure.in
+++ b/configure.in
@@ -640,7 +640,7 @@ AC_ARG_ENABLE(dbgutil,
  counting, etc. Larger build. Independent from --enable-debug.
  Note that this option makes the build ABI incompatible:
  It is not possible to mix object files or libraries from a
- --enable-dgbutil and a --disable-dbgutil build.]))
+ --enable-dbgutil and a --disable-dbgutil build.]))
 
 AC_ARG_ENABLE(linkoo,
 AS_HELP_STRING([--disable-linkoo],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: boost/prj

2012-05-09 Thread Fridrich Strba

 boost/prj/d.lst |4 
 1 file changed, 4 insertions(+)

New commits:
commit ef7a460fa51140782b7ad4d87aa782ca007c56ca
Author: Fridrich Å trba 
Date:   Wed May 9 17:19:34 2012 +0200

deliver the boost libraries we build

Change-Id: Idd3a133ee8271716518eb167192be91e76f90075

diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 03a7292..fdf7c49 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -1205,3 +1205,7 @@ mkdir: %_DEST%\inc\boost\xpressive\traits\detail
 ..\%__SRC%\inc\boost\xpressive\detail\utility\* 
%_DEST%\inc\boost\xpressive\detail\utility
 ..\%__SRC%\inc\boost\xpressive\traits\* %_DEST%\inc\boost\xpressive\traits
 ..\%__SRC%\inc\boost\xpressive\traits\detail\* 
%_DEST%\inc\boost\xpressive\traits\detail
+
+..\%__SRC%\lib\libboostdatetime.a %_DEST%\lib
+..\%__SRC%\slb\boostdatetime.lib %_DEST%\lib
+..\%__SRC%\slb\boostthread.lib %_DEST%\lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

{PATCH] fdo#44456 added calc function DATEDIF as in ODF 1.2

2012-05-09 Thread Winfried Donkers

Hi,

Attached patch adds function DATEDIF to calc as defined in ODF1.2 (6.10.3)

WinfriedFrom 61d133beff3ce513dbeb0df82453f3b9a780518b Mon Sep 17 00:00:00 2001
From: Winfried Donkers 
Date: Wed, 9 May 2012 16:47:13 +0200
Subject: [PATCH] fdo#44456 added calc function DATEDIF as in ODF1.2

Change-Id: I082ea20d02bf37d515fc33d627281696fc48fcb6
---
 formula/inc/formula/compiler.hrc   |7 +-
 formula/inc/formula/opcode.hxx |1 +
 formula/source/core/resource/core_resource.src |6 ++
 sc/inc/helpids.h   |1 +
 sc/qa/unit/ucalc.cxx   |1 +
 sc/source/core/inc/interpre.hxx|1 +
 sc/source/core/tool/interpr2.cxx   |   91 
 sc/source/core/tool/interpr4.cxx   |1 +
 sc/source/filter/excel/xlformula.cxx   |1 +
 sc/source/filter/oox/formulabase.cxx   |2 +-
 sc/source/ui/src/scfuncs.src   |   46 
 sc/util/hidother.src   |1 +
 12 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 15d8aab..a2d4bb5 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -399,10 +399,11 @@
 #define SC_OPCODE_BITXOR397
 #define SC_OPCODE_BITRSHIFT 398
 #define SC_OPCODE_BITLSHIFT 399
-#define SC_OPCODE_STOP_2_PAR400
-#define SC_OPCODE_LAST_OPCODE_ID399 /* last OpCode */
+#define SC_OPCODE_GET_DATEDIF   400
+#define SC_OPCODE_STOP_2_PAR401
+#define SC_OPCODE_LAST_OPCODE_ID401 /* last OpCode */
 
-/*** Interna ***/
+/*** Internal ***/
 #define SC_OPCODE_INTERNAL_BEGIN   
 #define SC_OPCODE_TTT  
 #define SC_OPCODE_INTERNAL_END 
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index b1e585c..a1543dd 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -212,6 +212,7 @@ enum OpCodeEnum
 ocGetTime   = SC_OPCODE_GET_TIME,
 ocGetDiffDate   = SC_OPCODE_GET_DIFF_DATE,
 ocGetDiffDate360= SC_OPCODE_GET_DIFF_DATE_360,
+ocGetDateDif= SC_OPCODE_GET_DATEDIF,
 ocMin   = SC_OPCODE_MIN,
 ocMax   = SC_OPCODE_MAX,
 ocSum   = SC_OPCODE_SUM,
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 12cb57d..1259231 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -170,6 +170,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_GET_TIME { Text = "TIME" ; };
 String SC_OPCODE_GET_DIFF_DATE { Text = "DAYS" ; };
 String SC_OPCODE_GET_DIFF_DATE_360 { Text = "DAYS360" ; };
+String SC_OPCODE_GET_DATEDIF { Text = "DATEDIF" ; };
 String SC_OPCODE_MIN { Text = "MIN" ; };
 String SC_OPCODE_MIN_A { Text = "MINA" ; };
 String SC_OPCODE_MAX { Text = "MAX" ; };
@@ -502,6 +503,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_GET_TIME { Text = "TIME" ; };
 String SC_OPCODE_GET_DIFF_DATE { Text = "DAYS" ; };
 String SC_OPCODE_GET_DIFF_DATE_360 { Text = "DAYS360" ; };
+String SC_OPCODE_GET_DATEDIF { Text = "DATEDIF" ; };
 String SC_OPCODE_MIN { Text = "MIN" ; };
 String SC_OPCODE_MIN_A { Text = "MINA" ; };
 String SC_OPCODE_MAX { Text = "MAX" ; };
@@ -1175,6 +1177,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "DAYS360" ;
 };
+String SC_OPCODE_GET_DATEDIF
+{
+Text [ en-US ] = "DATEDIF" ;
+};
 String SC_OPCODE_MIN
 {
 Text [ en-US ] = "MIN" ;
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 5eec0d1..8d41ab7 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -434,6 +434,7 @@
 #define HID_FUNC_WOCHENTAG  "SC_HID_FUNC_WOCHENTAG"
 #define HID_FUNC_JAHR   "SC_HID_FUNC_JAHR"
 #define HID_FUNC_TAGE   "SC_HID_FUNC_TAGE"
+#define HID_FUNC_DATEDIF"SC_HID_FUNC_DATEDIF"
 #define HID_FUNC_KALENDERWOCHE  "SC_HID_FUNC_KALENDERWOCHE"
 #define HID_FUNC_OSTERSONNTAG   "SC_HID_FUNC_OSTERSONNTAG"
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d875e42..ef33e64 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3076,6 +3076,7 @@ void Test::testFunctionLists()
 
 const char* aDateTime[] = {
 "DATE",
+"DATEDIF",
 "DATEVALUE",
 "DAY",
 "DAYS",
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 192c2e0..5f57fef 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/i

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

 sw/qa/extras/rtftok/data/fdo49271.rtf  |3 +++
 sw/qa/extras/rtftok/rtftok.cxx |   17 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   16 
 3 files changed, 36 insertions(+)

New commits:
commit 6092b332b99541bfdb9fd4bb14d0baa7dcf63e6a
Author: Miklos Vajna 
Date:   Wed May 9 16:07:12 2012 +0200

fdo#49271 rtftok: make sure we send char props if there are no runs

Change-Id: Id900b06fc1aad1d0f50ff92e3c12616dfbc1a81e

diff --git a/sw/qa/extras/rtftok/data/fdo49271.rtf 
b/sw/qa/extras/rtftok/data/fdo49271.rtf
new file mode 100644
index 000..4f3a48c
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo49271.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+\fs50 one \par \par two \par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index e7c51fa..92f722c 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -90,6 +90,7 @@ public:
 void testFdo38786();
 void testN757651();
 void testFdo49501();
+void testFdo49271();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -123,6 +124,7 @@ public:
 CPPUNIT_TEST(testFdo38786);
 CPPUNIT_TEST(testN757651);
 CPPUNIT_TEST(testFdo49501);
+CPPUNIT_TEST(testFdo49271);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -679,6 +681,21 @@ void Test::testFdo49501()
 CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
 }
 
+void Test::testFdo49271()
+{
+load("fdo49271.rtf");
+
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+xParaEnum->nextElement();
+uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+float fValue = 0;
+xPropertySet->getPropertyValue("CharHeight") >>= fValue;
+
+CPPUNIT_ASSERT_EQUAL(25.f, fValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 93b2812..1fd3d4d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1416,7 +1416,23 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 case RTF_PAR:
 {
 checkFirstRun();
+bool bNeedPap = m_bNeedPap;
 checkNeedPap();
+if (bNeedPap)
+{
+if (!m_pCurrentBuffer)
+{
+writerfilter::Reference::Pointer_t const 
pProperties(
+new 
RTFReferenceProperties(m_aStates.top().aCharacterAttributes, 
m_aStates.top().aCharacterSprms)
+);
+Mapper().props(pProperties);
+}
+else
+{
+RTFValue::Pointer_t pValue(new 
RTFValue(m_aStates.top().aCharacterAttributes, 
m_aStates.top().aCharacterSprms));
+m_pCurrentBuffer->push_back(make_pair(BUFFER_PROPS, 
pValue));
+}
+}
 if (!m_pCurrentBuffer)
 parBreak();
 else if (m_aStates.top().nDestinationState != 
DESTINATION_SHAPETEXT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#34814 - Importing doc with fonts unavailable on the system

On Tuesday 08 of May 2012, Caolán McNamara wrote:
> On Sat, 2012-05-05 at 08:53 +0100, Caolán McNamara wrote:
> > How about just moving the fix down to FontList::Get in
> > svtools/source/control/ctrltool.cxx in the !pFontInfo font-is-unknown
> > branch to look up the font name in the unotools fontcvt
> > list-of-known-symbol-fonts-we-can-emulate and toggle it there to be a
> > symbol font ?
>
> Like so maybe. But testing fdo#34814 the top .docx is unchanged-broken
> after import by this or the other patch,

 That document specifies the broken symbol to be used, so it's been already 
broken by a previous import.

> and new .docxs created from 
> scratch are unchanged-working either way. *shrug* whatever works.

 The patch works for what I've tested, so I've pushed to master and 3.5, 
thanks.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] get rid of CPU define/build system variable

2012-05-09 Thread Matúš Kukan

On 9 May 2012 06:02, Norbert Thiebaud  wrote:
> On Tue, May 8, 2012 at 1:04 PM, Michael Meeks  wrote:
>>        Can someone skilled in the gnumake / build environment review / apply:
>
> The patch does not remove CPU, just replace some of it's use with CPUNAME.

Nevertheless, I've pushed a subset of it. (I hope that's ok)
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9520dbf59f6bd6c86791954e082488556a610adc
Thanks!

But let's wait with these variable changes for conversions to gbuild.

Also for CPU=P there are two possibilities: CPUNAME = POWERPC |
POWERPC64, so one needs to be careful.

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

[Libreoffice-commits] .: basic/Library_sb.mk cairo/cairo cairo/pixman configure.in curl/makefile.mk icu/makefile.mk nss/makefile.mk odk/util postprocess/rebase python/makefile.mk reportbuilder/util sa

2012-05-09 Thread Matus Kukan

 basic/Library_sb.mk |8 
 cairo/cairo/makefile.mk |2 +-
 cairo/pixman/makefile.mk|2 +-
 configure.in|4 ++--
 curl/makefile.mk|2 +-
 icu/makefile.mk |2 +-
 nss/makefile.mk |6 +++---
 odk/util/makefile.pmk   |4 ++--
 postprocess/rebase/makefile.mk  |2 +-
 python/makefile.mk  |4 ++--
 reportbuilder/util/makefile.pmk |2 +-
 sal/Library_sal.mk  |4 ++--
 salhelper/test/rtti/makefile.mk |2 +-
 setup_native/scripts/source/makefile.mk |4 ++--
 14 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 9520dbf59f6bd6c86791954e082488556a610adc
Author: Thomas Collerton 
Date:   Wed May 9 01:22:29 2012 +0200

EasyHack fdo#42783: get rid of CPU define/build system variable

Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 352f3e6..acf3996 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -156,12 +156,12 @@ $(eval $(call gb_Library_use_libraries,sb,\
 ))
 endif
 
-ifeq ($(GUI)$(CPU),WNTI)
+ifeq ($(GUI)$(CPUNAME),WNTINTEL)
 $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x86 \
 ))
 else
-ifeq ($(GUI)$(CPU),WNTX)
+ifeq ($(GUI)$(CPUNAME),WNTX86_64)
 $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
 ))
@@ -171,12 +171,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 ))
 endif
 endif
-ifeq ($(GUI)$(COM)$(CPU),WNTMSCI)
+ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL)
 $(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
 ))
 endif
-ifeq ($(GUI)$(COM)$(CPU),WNTGCCI)
+ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL)
 $(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-mingw \
 ))
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 16a89bf..43f7b8f 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -156,7 +156,7 @@ LDFLAGS:=$(cairo_LDFLAGS)
 cairo_CFLAGS+=-xc99=none
 .ENDIF
 
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
 cairo_CFLAGS+=-march=i486
 .ENDIF
 
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 307f852..a584b52 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -117,7 +117,7 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib 
-L$(SOLARLIBDIR) -lpthread -ld
 pixman_CFLAGS+=-xc99=none
 .ENDIF
 
-.IF "$(CPU)"=="I"
+.IF "$(CPUNAME)"=="INTEL"
 pixman_CFLAGS+=-march=i486
 .ENDIF
 
diff --git a/configure.in b/configure.in
index 8e37485..c471e34 100644
--- a/configure.in
+++ b/configure.in
@@ -2995,8 +2995,8 @@ darwin*)
 ;;
 powerpc*)
 CPU=P
-CPUNAME="POWERPC"
-OUTPATH="unxmacxp"
+CPUNAME=POWERPC
+OUTPATH=unxmacxp
 ;;
 i*86|x86_64)
 CPU=I
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 3eabe72..97a1835 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -140,7 +140,7 @@ EXCFLAGS="/EHsc /YX"
 
 BUILD_DIR=.$/lib
 
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
 MACHINE=X86
 .ELSE
 MACHINE=X64
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 35d847d..9cc4905 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -283,7 +283,7 @@ ICU_BUILD_VERSION=Release
 ICU_BUILD_LIBPOST=
 .ENDIF
 
-.IF "$(CPU)" == "I"
+.IF "$(CPUNAME)" == "INTEL"
 ICU_BUILD_ARCH=Win32
 .ELSE
 ICU_BUILD_ARCH=x64
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 2a1dd0f..4e8dd9d 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -76,15 +76,15 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure 
--prefix=$(my_prefix) --includedir=$(
 # force 64-bit buildmode
 USE_64:=1
 .EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(CPUNAME)"=="X86_64"
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC"
 
 .IF "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(CPU)"=="X"
+.IF "$(CPUNAME)"=="X86_64"
 # force 64-bit buildmode
 USE_64:=1
 .EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(CPUNAME)"=="X86_64"
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC"
 
 .IF "$(OS)"=="MACOSX"
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 583f33a..3ffb45c 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -114,7 +114,7 @@ MY_DLLPOSTFIX=.so
 MY_DLLOUT=$(OUT)/lib
 DLLOUT=$(SOLARLIBDIR)
 
-.IF "$(OS)$(CPU)"=="SOLARISS"
+.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC"
 # SOLARIS SPARC
 DESTPLATFROM=solsparc
 
@@ -122,7 +122,7 @@ DESTPLATFROM=solsparc
 # SOLARIS SPARC 64
 DESTPLATFROM=solsparc64
 
-.ELIF "$(OS)$(CPU)"=="SOLARISI"
+.ELIF "$(OS)$(CPUNAME)"=="SOLARISINTEL"
 # SOLARIS INTEL
 DESTPLATFROM=solintel
 
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index a6a2eb9..c5d7615 100644
--

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

2012-05-09 Thread Takeshi Abe

 svtools/source/dialogs/filedlg2.cxx |   11 
 svtools/source/edit/textdata.cxx|   13 -
 svtools/source/edit/textdoc.hxx |6 
 svtools/source/edit/texteng.cxx |   32 
 svtools/source/edit/textund2.hxx|   20 ---
 svtools/source/edit/textview.cxx|   37 
 svtools/source/filter/FilterConfigCache.cxx |5 ---
 svtools/source/filter/ixbm/xbmread.cxx  |2 -
 svtools/source/filter/wmf/winmtf.cxx|2 -
 svtools/source/graphic/grfmgr2.cxx  |1 
 svtools/source/hatchwindow/ipwin.cxx|   34 -
 svtools/source/misc/wallitem.cxx|   10 ---
 svtools/source/svrtf/parrtf.cxx |   34 -
 svtools/source/svrtf/svparser.cxx   |8 --
 svtools/source/uno/treecontrolpeer.cxx  |2 -
 15 files changed, 1 insertion(+), 216 deletions(-)

New commits:
commit d7f5dcbc413b4bf89a70fc25a20533323840b63c
Author: Takeshi Abe 
Date:   Wed May 9 23:27:45 2012 +0900

removed unused defines

Change-Id: Ife6ba8104a3af79aa5d62509755b9d2c58d98e3a

diff --git a/svtools/source/dialogs/filedlg2.cxx 
b/svtools/source/dialogs/filedlg2.cxx
index d16f65a..2b74255 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -52,17 +52,6 @@ using namespace com::sun::star::uno;
 
 typedef ::std::vector< UniString* > UniStringList;
 
-#define STD_BTN_WIDTH   80
-#define STD_BTN_HEIGHT  26
-
-#ifndef UNX
-#define ALLFILES"*.*"
-#else
-#define ALLFILES"*"
-#endif
-//  #define STD_BTN_WIDTH   90
-//  #define STD_BTN_HEIGHT  35
-
 #define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \
 p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \
 p->SetHelpId( rHelpId ); \
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index f629ff6..fa62f3f 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -72,10 +72,6 @@ using namespace ::rtl;
 
 typedef TextView* TextViewPtr;
 SV_DECL_PTRARR( TextViews, TextViewPtr, 0 )
-// SV_IMPL_PTRARR( TextViews, TextViewPtr );
-
-#define RESDIFF 10
-#define SCRLRANGE   20  // 1/20 der Breite/Hoehe scrollen, wenn im 
QueryDrop
 
 
 // -
diff --git a/svtools/source/filter/FilterConfigCache.cxx 
b/svtools/source/filter/FilterConfigCache.cxx
index 66ffb8d..c7bd37c 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -34,11 +34,6 @@
 #include 
 #include 
 
-#define TOKEN_COUNT_FOR_OWN_FILTER  3
-// #define TOKEN_INDEX_FOR_IDENT  0
-#define TOKEN_INDEX_FOR_FILTER  1
-// #define TOKEN_INDEX_FOR_HASDIALOG  2
-
 using namespace ::com::sun::star::lang  ;   // XMultiServiceFactory
 using namespace ::com::sun::star::container ;   // XNameAccess
 using namespace ::com::sun::star::uno   ;   // Reference
diff --git a/svtools/source/filter/ixbm/xbmread.cxx 
b/svtools/source/filter/ixbm/xbmread.cxx
index 84a8b02..1b79c3f 100644
--- a/svtools/source/filter/ixbm/xbmread.cxx
+++ b/svtools/source/filter/ixbm/xbmread.cxx
@@ -27,8 +27,6 @@
  /
 
 
-#define XBMMINREAD 512
-
 #define _XBMPRIVATE
 #include 
 #include 
diff --git a/svtools/source/filter/wmf/winmtf.cxx 
b/svtools/source/filter/wmf/winmtf.cxx
index 6abf445..2968ec1 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -41,8 +41,6 @@
 
 // 
 
-#define WIN_MTF_MAX_CLIP_DEPTH 16
-
 #if OSL_DEBUG_LEVEL > 1
 #define EMFP_DEBUG(x) x
 #else
diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index 35de9a6..1967e44 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -44,7 +44,6 @@
 // - defines -
 // ---
 
-#define MAX_PRINTER_EXT 1024
 #define MAP( cVal0, cVal1, nFrac )  
((sal_uInt8)long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
 #define WATERMARK_LUM_OFFSET50
 #define WATERMARK_CON_OFFSET-70
diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index 7c70608..1d0fb8e 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -34,14 +34,6 @@
 #include 
 #include 
 
-#define SVPAR_CSM_
-
-#define SVPAR_CSM_ANSI  0x0001U
-#define SVPAR_CSM_UTF8  0x0002U
-#define SVPAR_CSM_UCS2B 0x0004U
-#define SVPAR_CSM_UCS2L 0x0008U
-#define SVPAR_CSM_SWITCH0x8000U
-
 // Struktur, um sich die akt. Daten zumerken
 struct SvParser_Impl
 {
diff --git a/svtools/source/uno/treecontrolpeer.cxx 
b/svt

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-05-09 Thread bugzilla-daemon

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

Bug 37361 depends on bug 34814, which changed state.

Bug 34814 Summary: FILEOPEN FILESAVE Bullet lists in file saved as .doc or 
.docx are loaded incorrectly
https://bugs.freedesktop.org/show_bug.cgi?id=34814

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|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] .: Branch 'libreoffice-3-5' - svtools/source

 svtools/source/control/ctrltool.cxx |   79 
 1 file changed, 44 insertions(+), 35 deletions(-)

New commits:
commit 1dc9f21667237bf61ec8d2a9e50b7fb8a61d475b
Author: CaolÃ¡n McNamara 
Date:   Tue May 8 16:08:16 2012 +0100

Related: fdo#34814 check if a missing font is a known symbol font

Change-Id: I85f8e3fe7a30a59b2e458706b927d8f9c3a65abc
Signed-off-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index 146f47e..b38d782 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -595,7 +595,30 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo 
) const
 }
 }
 
-// ---
+namespace
+{
+FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const 
rtl::OUString &rName,
+FontWeight eWeight, FontItalic eItalic)
+{
+FontInfo aInfo;
+// Falls der Fontname stimmt, uebernehmen wir soviel wie moeglich
+if (pFontNameInfo)
+{
+aInfo = *pFontNameInfo;
+aInfo.SetStyleName(rtl::OUString());
+}
+
+aInfo.SetWeight(eWeight);
+aInfo.SetItalic(eItalic);
+
+//If this is a known but uninstalled symbol font which we can remap to
+//OpenSymbol then toggle its charset to be a symbol font
+if (ConvertChar::GetRecodeData(rName, 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenSymbol"
+aInfo.SetCharSet(RTL_TEXTENCODING_SYMBOL);
+
+return aInfo;
+}
+}
 
 FontInfo FontList::Get( const XubString& rName, const XubString& rStyleName ) 
const
 {
@@ -624,54 +647,50 @@ FontInfo FontList::Get( const XubString& rName, const 
XubString& rStyleName ) co
 FontInfo aInfo;
 if ( !pFontInfo )
 {
-if ( pFontNameInfo )
-aInfo = *pFontNameInfo;
+FontWeight eWeight = WEIGHT_DONTKNOW;
+FontItalic eItalic = ITALIC_NONE;
 
 if ( rStyleName == maNormal )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_NORMAL );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_NORMAL;
 }
 else if ( rStyleName == maNormalItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_NORMAL );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_NORMAL;
 }
 else if ( rStyleName == maBold )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_BOLD );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_BOLD;
 }
 else if ( rStyleName == maBoldItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_BOLD );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_BOLD;
 }
 else if ( rStyleName == maLight )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_LIGHT );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_LIGHT;
 }
 else if ( rStyleName == maLightItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_LIGHT );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_LIGHT;
 }
 else if ( rStyleName == maBlack )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_BLACK );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_BLACK;
 }
 else if ( rStyleName == maBlackItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_BLACK );
-}
-else
-{
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_DONTKNOW );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_BLACK;
 }
+aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
 }
 else
 aInfo = *pFontInfo;
@@ -712,17 +731,7 @@ FontInfo FontList::Get( const XubString& rName,
 // Attribute nachgebildet werden
 FontInfo aInfo;
 if ( !pFontInfo )
-{
-// Falls der Fontname stimmt, uebernehmen wir soviel wie moeglich
-if ( pFontNameInfo )
-{
-aInfo = *pFontNameInfo;
-aInfo.SetStyleName( XubString() );
-}
-
-aInfo.SetWeight( eWeight );
-aInfo.SetItalic( eItalic );
-}
+aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
 else
 aInfo = *pFontInfo;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 shell/source/backends/gconfbe/gconfbackend.cxx |6 ---
 shell/source/backends/gconfbe/makefile.mk  |2 -
 shell/source/backends/gconfbe/orbit.h  |   42 -
 3 files changed, 2 insertions(+), 48 deletions(-)

New commits:
commit a91f9b10edc31f3c4ad7209f97924990cc5b6796
Author: Ross Burton 
Date:   Wed Apr 18 21:26:38 2012 +0100

Don't check for ORBit < 2.8

ORBit 2.8 was released in 2003 so let's assume that this isn't being used.  
Also
the assumption is that it's coming in through GConf, which isn't true with 
GConf
3 onwards, released July 2011.

Conflicts:

shell/source/backends/gconfbe/gconfbackend.cxx

Signed-off-by: Michael Meeks 

diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx 
b/shell/source/backends/gconfbe/gconfbackend.cxx
index bff67fa..0de577a 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -61,7 +61,6 @@
 #include "uno/lbnames.h"
 
 #include "gconfaccess.hxx"
-#include "orbit.h"
 
 namespace {
 
@@ -165,10 +164,7 @@ Service::Service(): enabled_(false) {
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
 desktop;
-enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) &&
-((orbit_major_version == 2 && orbit_minor_version >= 8) ||
- orbit_major_version > 2);
-// ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
+enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"));
 }
 }
 
diff --git a/shell/source/backends/gconfbe/makefile.mk 
b/shell/source/backends/gconfbe/makefile.mk
index 9e77a08..84ec3db 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -46,7 +46,7 @@ CFLAGS+=-DENABLE_LOCKDOWN
 
 .IF "$(ENABLE_GCONF)"!=""
 COMPILER_WARN_ALL=TRUE
-PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
+PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0
 .INCLUDE: pkg_config.mk
 
 .IF "$(OS)" == "SOLARIS"
diff --git a/shell/source/backends/gconfbe/orbit.h 
b/shell/source/backends/gconfbe/orbit.h
deleted file mode 100755
index 82673a3..000
--- a/shell/source/backends/gconfbe/orbit.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H
-#define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H
-
-#include "sal/config.h"
-
-#if defined __GNUC__
-#pragma GCC system_header
-#endif
-
-#include 
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/Helper.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e636c23bb9247325fba469612843399732ed4cd0
Author: Michael Stahl 
Date:   Wed May 9 15:39:43 2012 +0200

fix gb_Helper_abbreviate_dirs_native $ quoting

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3ac278d..93a0ad7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -48,11 +48,11 @@ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst 
$(WORKDIR)/,$$W/,$(1
 endef
 
 define gb_Helper_abbreviate_dirs_native
-$$(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use 
gb_Helper_abbreviate_dirs instead.)
+$(call gb_Output_error,gb_Helper_abbreviate_dirs_native: use 
gb_Helper_abbreviate_dirs instead.)
 endef
 
 define gb_Helper_native_path
-$$(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be 
necessary.)
+$(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be 
necessary.)
 endef
 
 define gb_Helper_make_clean_target
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unotest/inc

 unotest/inc/unotest/macros_test.hxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b1aeac0b6e11688af52952b6ae3e8ae4b2f855e6
Author: Miklos Vajna 
Date:   Wed May 9 15:37:05 2012 +0200

unotest: missing include guard in macros_test.hxx

Change-Id: Iee44d81a3667613485785481dcc0cb46f3b6a8ff

diff --git a/unotest/inc/unotest/macros_test.hxx 
b/unotest/inc/unotest/macros_test.hxx
index e95705f..a1c750f 100644
--- a/unotest/inc/unotest/macros_test.hxx
+++ b/unotest/inc/unotest/macros_test.hxx
@@ -26,6 +26,9 @@
  * instead of those above.
  */
 
+#ifndef INCLUDED_UNOTEST_MACROS_TEST_HXX
+#define INCLUDED_UNOTEST_MACROS_TEST_HXX
+
 #include 
 #include "unotest/detail/unotestdllapi.hxx"
 
@@ -51,4 +54,6 @@ protected:
 
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

 sw/qa/extras/ooxmltok/ooxmltok.cxx   |   27 +--
 sw/qa/extras/rtfexport/rtfexport.cxx |   48 +
 sw/qa/extras/rtftok/rtftok.cxx   |   50 +
 sw/qa/extras/swmodeltestbase.hxx |   80 +++
 sw/qa/extras/ww8tok/ww8tok.cxx   |   26 +--
 5 files changed, 92 insertions(+), 139 deletions(-)

New commits:
commit 333ba4627e4c6ae5633b22526881388c335b
Author: Miklos Vajna 
Date:   Wed May 9 15:25:44 2012 +0200

sw: move common methods of subsequent filter tests to a SwModelTestBase

Change-Id: I71316d6c5b6f4fb820bd541be1cfbb4d39dd261e

diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 00aa2c2..2c672d2 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -25,6 +25,8 @@
  * instead of those above.
  */
 
+#include "../swmodeltestbase.hxx"
+
 #include 
 #include 
 #include 
@@ -33,25 +35,19 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
-#include 
-#include 
 #include 
 
 using rtl::OString;
 using rtl::OUString;
 using rtl::OUStringBuffer;
-using namespace com::sun::star;
 
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public SwModelTestBase
 {
 public:
-virtual void setUp();
-virtual void tearDown();
 void testN751054();
 void testN751117();
 void testN751017();
@@ -71,7 +67,6 @@ public:
 private:
 /// Load an OOXML file and make the document available via mxComponent.
 void load(const OUString& rURL);
-uno::Reference mxComponent;
 };
 
 void Test::load(const OUString& rFilename)
@@ -79,22 +74,6 @@ void Test::load(const OUString& rFilename)
 mxComponent = 
loadFromDesktop(getURLFromSrc("/sw/qa/extras/ooxmltok/data/") + rFilename);
 }
 
-void Test::setUp()
-{
-test::BootstrapFixture::setUp();
-
-
mxDesktop.set(getMultiServiceFactory()->createInstance("com.sun.star.frame.Desktop"),
 uno::UNO_QUERY);
-CPPUNIT_ASSERT(mxDesktop.is());
-}
-
-void Test::tearDown()
-{
-if (mxComponent.is())
-mxComponent->dispose();
-
-test::BootstrapFixture::tearDown();
-}
-
 void Test::testN751054()
 {
 load("n751054.docx");
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 9f2cb18..74b0ca8 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -25,26 +25,22 @@
  * instead of those above.
  */
 
+#include "../swmodeltestbase.hxx"
+
 #include 
-#include 
 #include 
 #include 
 
-#include 
-#include 
 #include 
 #include 
 
 using rtl::OString;
 using rtl::OUString;
 using rtl::OUStringBuffer;
-using namespace com::sun::star;
 
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public SwModelTestBase
 {
 public:
-virtual void setUp();
-virtual void tearDown();
 void testZoom();
 void testFdo38176();
 void testFdo49683();
@@ -59,9 +55,6 @@ public:
 
 private:
 void roundtrip(const OUString& rURL);
-/// Get the length of the whole document.
-int getLength();
-uno::Reference mxComponent;
 };
 
 void Test::roundtrip(const OUString& rFilename)
@@ -77,41 +70,6 @@ void Test::roundtrip(const OUString& rFilename)
 mxComponent = loadFromDesktop(aTempFile.GetURL());
 }
 
-int Test::getLength()
-{
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-OUStringBuffer aBuf;
-while (xParaEnum->hasMoreElements())
-{
-uno::Reference 
xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
-uno::Reference xRangeEnum = 
xRangeEnumAccess->createEnumeration();
-while (xRangeEnum->hasMoreElements())
-{
-uno::Reference xRange(xRangeEnum->nextElement(), 
uno::UNO_QUERY);
-aBuf.append(xRange->getString());
-}
-}
-return aBuf.getLength();
-}
-
-void Test::setUp()
-{
-test::BootstrapFixture::setUp();
-
-
mxDesktop.set(getMultiServiceFactory()->createInstance("com.sun.star.frame.Desktop"),
 uno::UNO_QUERY);
-CPPUNIT_ASSERT(mxDesktop.is());
-}
-
-void Test::tearDown()
-{
-if (mxComponent.is())
-mxComponent->dispose();
-
-test::BootstrapFixture::tearDown();
-}
-
 void Test::testZoom()
 {
 roundtrip("zoom.rtf");
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 8b41569..e7c51fa 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -25,7 +25,8 @@
  * instead of those above.
  */
 
-#include 
+#include "../swmodeltestbase.hxx"
+
 #include 
 #include 
 #include 
@@ -39,7 +40,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -48,24 +48,18 @@
 #include 
 
 #include 
-#include 
-#include 
 #include 
 #include 
-#inclu

[Libreoffice-commits] .: lotuswordpro/source

 lotuswordpro/source/filter/explode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f909446caae6d4e091c2bb2dae36ae648491eef2
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 14:27:42 2012 +0100

WaE: C4146 unary operator applied to unsigned type

Change-Id: I5326baab63d8ec30a2f7fcb027c4a5a5526acdf0

diff --git a/lotuswordpro/source/filter/explode.cxx 
b/lotuswordpro/source/filter/explode.cxx
index 241d43d..625d1cf 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -306,7 +306,7 @@ sal_Int32 Decompression::explode()
 
 m_pOutStream->Flush();
 // point back to copy position and read bytes
-m_pOutStream->SeekRel((long)-distance);
+m_pOutStream->SeekRel(-(long)distance);
 sal_uInt8 sTemp[MAXWIN];
 sal_uInt32 nRead = distance > Length? Length:distance;
 m_pOutStream->Read(sTemp, nRead);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

 svtools/source/control/ctrltool.cxx |   79 
 1 file changed, 44 insertions(+), 35 deletions(-)

New commits:
commit 13e6af8860f42daf49474a7ae9779baa0f8f2630
Author: CaolÃ¡n McNamara 
Date:   Tue May 8 16:08:16 2012 +0100

Related: fdo#34814 check if a missing font is a known symbol font

Change-Id: I85f8e3fe7a30a59b2e458706b927d8f9c3a65abc

diff --git a/svtools/source/control/ctrltool.cxx 
b/svtools/source/control/ctrltool.cxx
index 01459ad..3fdd515 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -583,7 +583,30 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo 
) const
 }
 }
 
-// ---
+namespace
+{
+FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const 
rtl::OUString &rName,
+FontWeight eWeight, FontItalic eItalic)
+{
+FontInfo aInfo;
+// Falls der Fontname stimmt, uebernehmen wir soviel wie moeglich
+if (pFontNameInfo)
+{
+aInfo = *pFontNameInfo;
+aInfo.SetStyleName(rtl::OUString());
+}
+
+aInfo.SetWeight(eWeight);
+aInfo.SetItalic(eItalic);
+
+//If this is a known but uninstalled symbol font which we can remap to
+//OpenSymbol then toggle its charset to be a symbol font
+if (ConvertChar::GetRecodeData(rName, rtl::OUString("OpenSymbol")))
+aInfo.SetCharSet(RTL_TEXTENCODING_SYMBOL);
+
+return aInfo;
+}
+}
 
 FontInfo FontList::Get( const XubString& rName, const XubString& rStyleName ) 
const
 {
@@ -612,54 +635,50 @@ FontInfo FontList::Get( const XubString& rName, const 
XubString& rStyleName ) co
 FontInfo aInfo;
 if ( !pFontInfo )
 {
-if ( pFontNameInfo )
-aInfo = *pFontNameInfo;
+FontWeight eWeight = WEIGHT_DONTKNOW;
+FontItalic eItalic = ITALIC_NONE;
 
 if ( rStyleName == maNormal )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_NORMAL );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_NORMAL;
 }
 else if ( rStyleName == maNormalItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_NORMAL );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_NORMAL;
 }
 else if ( rStyleName == maBold )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_BOLD );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_BOLD;
 }
 else if ( rStyleName == maBoldItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_BOLD );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_BOLD;
 }
 else if ( rStyleName == maLight )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_LIGHT );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_LIGHT;
 }
 else if ( rStyleName == maLightItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_LIGHT );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_LIGHT;
 }
 else if ( rStyleName == maBlack )
 {
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_BLACK );
+eItalic = ITALIC_NONE;
+eWeight = WEIGHT_BLACK;
 }
 else if ( rStyleName == maBlackItalic )
 {
-aInfo.SetItalic( ITALIC_NORMAL );
-aInfo.SetWeight( WEIGHT_BLACK );
-}
-else
-{
-aInfo.SetItalic( ITALIC_NONE );
-aInfo.SetWeight( WEIGHT_DONTKNOW );
+eItalic = ITALIC_NORMAL;
+eWeight = WEIGHT_BLACK;
 }
+aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
 }
 else
 aInfo = *pFontInfo;
@@ -700,17 +719,7 @@ FontInfo FontList::Get( const XubString& rName,
 // Attribute nachgebildet werden
 FontInfo aInfo;
 if ( !pFontInfo )
-{
-// Falls der Fontname stimmt, uebernehmen wir soviel wie moeglich
-if ( pFontNameInfo )
-{
-aInfo = *pFontNameInfo;
-aInfo.SetStyleName( XubString() );
-}
-
-aInfo.SetWeight( eWeight );
-aInfo.SetItalic( eItalic );
-}
+aInfo = makeMissing(pFontNameInfo, rName, eWeight, eItalic);
 else
 aInfo = *pFontInfo;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][PATCH] Incorrect character written out when saved in HTML format

On Tue, 2012-05-08 at 14:31 +0100, Michael Meeks wrote:
>   https://bugs.freedesktop.org/show_bug.cgi?id=38989
> patch:
>   https://bugs.freedesktop.org/attachment.cgi?id=52063
> 
>   Review appreciated

Looks good, original code is fairly nonsensical and in since 2000.
Pushed now to master.

caolanm->gordon: can you confirm your patch is under our preferred
LGPLv3+/MPL+ license combination ?

C.

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

[Libreoffice-commits] .: svtools/source

 svtools/source/svhtml/htmlout.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 2221e0a0be16ffc0402b336ad308feff8a693a8a
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 13:53:58 2012 +0100

remove comment, it'll only confuse matters

Change-Id: I3268dd37834b4a2ece084e4d0843e7c38cc39c83

diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index 54ab173..18e1752 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -413,12 +413,7 @@ rtl::OString lcl_ConvertCharToHTML( sal_Unicode c,
 case 0xA0:  // is a hard blank
 pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
 break;
-// This was labelled as:
-//!! the TextConverter has a problem with this character - so change it to
-// a hard space - that's the same as our 5.2
-//   but that just breaks html output.  Setting the numberic html entity
-//   seems fine.
-case 0x2011:   // is a hard hyphen
+case 0x2011:// is a hard hyphen
 pStr = "#8209";
 break;
 case 0xAD:  // is a soft hyphen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need help with debugging LO freeze

On Tue, 2012-05-08 at 21:10 +0200, Daniel Naber wrote:
> I'm quite sure, as I just print the milliseconds before and after certain 
> lines. This line often takes about 20ms on my computer, because its result 
> is not cached:

ok ? when I ctrl-c I get traces going into Java and into languagetool
from this place:

... empty java frames ...
JNI stuff
libjava_uno.so
libgcc3_uno.so  
LngSvcMgd::GetAvailableGrammarSvcs_Impl()
...

There is (by now) probably some wunder-Java/gdb/python thing that would
unwind the stack enough to show what methods are being jitted (I guess),
but I don't know how to do that.

> As it is called about 200 times because of the many Locales that 
> Languagetool supports, I get a 4-second freeze.

Right - I get a 9 second freeze here (wow) - but I'm running under
strace -f -o /tmp/slog -ttt with some instrumentation (I attach the
patch) - it's a bit of a fun hack ;-) but it shows at least something.

The transition into java is made much more painful by the large number
of maps we have in /proc/self/maps - which has to be parsed to ensure
that we add/remove the stack-guard page as we enter/leave java (sadly
that performs really poorly) - /proc/self/maps is 68K and is 'read' 1K
at a time - 68 system-calls per switch to Java (sigh).

> Maybe there simply never was a component which supports that many locales, 
> thus this was never an issue...

Yep - it's possible :-) but I think you're on the money with the cache
idea - it seems nonsensical to me that we would call:
'GetAvailableGrammarSvcs_Impl' so many times back-to-back without
pAvailGrammarSvcs being set to cache it. After all - if we change the
configure keys - we should refresh that thing.

So - after all that ;-) I'm essentially with you that disabling caching
in LngSvcMgr::getAvailableServices is really silly :-) particularly
since the LngSvcMgr::Notify() -should- cause the cache to be
re-generated if the GrammarCheckerList is changed [ does that include
new languages ? ].

Wow - the CalcDataFilesChangedCheckValue() method seems to always
return zero ;-) so ... it'd be worth chopping that out of the code as a
simple re-factor to clarify (seems that's just a first-start style
boolean). 

I guess; in general it'd be rather nice to have a nice, pretty, boost
"UNO components changed" signal - that denotes that a new component has
been installed / removed - so we could throw away some of these
caches :-) Stephan - is there anything like that, that we could hook ?

Daniel - thanks for doing some great research here - what's your
preferred fix ? any chance of a patch for that so we can give credit
where it is due ? [ or do you want me to go wild in that general area -
a bonus of doing it yourself is that I can sign it off for
3.5. ;-]

Many thanks,

Michael

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index b93364b..5e57f50 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -790,6 +790,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
 }
 }

+#include 

 void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 {
@@ -797,6 +798,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 {
 pAvailGrammarSvcs = new SvcInfoArray;

+access ("grammar: start_impl", 0);
 uno::Reference< lang::XMultiServiceFactory >  xFac( comphelper::getProcessServiceFactory() );
 if (xFac.is())
 {
@@ -823,7 +825,9 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY );

 xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
+access ("grammar: createInstance", 0);
 xSvc = uno::Reference< linguistic2::XProofreader >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY );
+access ("grammar: createInstance - done", 0);
 }
 catch (uno::Exception &rEx)
 {
@@ -837,6 +841,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 OUStringaImplName;
 uno::Sequence< sal_Int16 >   aLanguages;
 uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
+access ("grammar: getImplementationName", 0);
 if (xInfo.is())
 aImplName = xInfo->getImplementationName();
 DBG_ASSERT( aImplName.getLength(),
@@ -849,10 +854,12 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
 }

 pAvailGrammarSvcs->pu

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/util solenv/bin

2012-05-09 Thread Andras Timar

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt  |   12 +
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt |2 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt |8 -
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt   |1 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |   12 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |   12 +
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt  |9 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt|1 
 instsetoo_native/util/openoffice.lst|1 
 solenv/bin/make_installer.pl|   16 ++
 solenv/bin/modules/installer/simplepackage.pm   |5 
 solenv/bin/modules/installer/windows/idtglobal.pm   |   69 
++
 solenv/bin/modules/installer/windows/property.pm|   23 +++
 14 files changed, 169 insertions(+), 4 deletions(-)

New commits:
commit 949e9a5c55c6ddc63e53a5e5959773ec39bd7331
Author: Andras Timar 
Date:   Wed May 9 13:41:19 2012 +0200

partially revert 6d1f7fadc06bb57b175d5f4b94147373fc07f8a8

Change-Id: I I I0bfc367a3b2c551509b383fc4f6dcaa3cb8661f8

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index de52236..f1b7ff0 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -175,6 +175,18 @@ InstallWelcome Image   Bitmap  0   0   122 
234 1   ImageBmp
 InstallWelcome NextPushButton  230 243 66  17  3   
OOO_CONTROL_125 Cancel  
 InstallWelcome TextLine1   Text135 8   225 45  65539   
OOO_CONTROL_126 
 InstallWelcome TextLine2   Text135 55  228 45  65539   
OOO_CONTROL_127 
+LicenseAgreement   Agree   RadioButtonGroup8   190 330 
40  3   AgreeToLicense  Back
+LicenseAgreement   BackPushButton  164 243 66  17  
3   OOO_CONTROL_128 Next
+LicenseAgreement   Banner  Bitmap  0   0   374 44  1   
BannerBmp   
+LicenseAgreement   BannerLine  Line0   44  374 0   
1   
+LicenseAgreement   Branding1   Text4   229 140 13  
3   {&MSSWhiteSerif8}[ProductName]  
+LicenseAgreement   Branding2   Text3   228 140 13  
65537   [ProductName]   
+LicenseAgreement   Cancel  PushButton  301 243 66  17  
3   OOO_CONTROL_131 Agree   
+LicenseAgreement   DlgDesc Text21  23  272 25  65539   
OOO_CONTROL_132 
+LicenseAgreement   DlgLine Line145 234 229 0   1   

+LicenseAgreement   DlgTitleText13  6   280 25  
65539   OOO_CONTROL_133 
+LicenseAgreement   MemoScrollableText  8   54  358 130 
7   
+LicenseAgreement   NextPushButton  230 243 66  17  
3   OOO_CONTROL_134 Cancel  
 MaintenanceTypeBackPushButton  164 243 66  17  
3   OOO_CONTROL_135 Next
 MaintenanceTypeBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 MaintenanceTypeBannerLine  Line0   44  374 0   
1   
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index 9e3faef..4063ebb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -12,6 +12,8 @@ CustomSetup   Details HideInstalled
 CustomSetupInstallLabelHideInstalled
 InstallWelcome Copyright   HideSHOWCOPYRIGHT="No"
 InstallWelcome Copyright   ShowSHOWCOPYRIGHT="Yes"
+LicenseAgreement   NextDisable AgreeToLicense <> "Yes"
+LicenseAgreement   NextEnable  AgreeToLicense = "Yes"
 ReadyToInstall DlgTitleShowProgressType0="Modify"
 ReadyToInstall DlgTitle2   ShowProgressType0="Repair"
 ReadyToInstall DlgTitle3   ShowProgressType0="install"
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE

[Libreoffice-commits] .: svtools/source

 svtools/source/svhtml/htmlout.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3ea961725a8488082e3741df98cbea358d807c87
Author: Gordon Lack 
Date:   Wed May 9 13:51:44 2012 +0100

Incorrect character written out when saved in HTML format

Change-Id: I0ac19bf724be64004aeaecad67e95627a098975f

diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index d35d4af..54ab173 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -411,10 +411,15 @@ rtl::OString lcl_ConvertCharToHTML( sal_Unicode c,
 switch( c )
 {
 case 0xA0:  // is a hard blank
+pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
+break;
+// This was labelled as:
 //!! the TextConverter has a problem with this character - so change it to
 // a hard space - that's the same as our 5.2
-case 0x2011:// is a hard hyphen
-pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
+//   but that just breaks html output.  Setting the numberic html entity
+//   seems fine.
+case 0x2011:   // is a hard hyphen
+pStr = "#8209";
 break;
 case 0xAD:  // is a soft hyphen
 pStr = OOO_STRING_SVTOOLS_HTML_S_shy;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa writerfilter/Library_rtftok.mk writerfilter/source

 sw/qa/extras/rtfexport/data/fdo49683.rtf   |5 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |   15 +++
 writerfilter/Library_rtftok.mk |1 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 +
 5 files changed, 29 insertions(+)

New commits:
commit 831b712d3da08f0050d2ee92c384ad8e6a2e461c
Author: Miklos Vajna 
Date:   Wed May 9 14:30:55 2012 +0200

fdo#49683 implement RTF_KEYWORDS

Use comphelper::string::convertCommaSeparated(), as done in
RtfExport::WriteInfo().

Change-Id: Iad4c3c57cf2e16c7256b9853cb1a6a0843463387

diff --git a/sw/qa/extras/rtfexport/data/fdo49683.rtf 
b/sw/qa/extras/rtfexport/data/fdo49683.rtf
new file mode 100644
index 000..c68aa05
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo49683.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+{\info
+{\keywords one, two}
+}
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index d33ec36..9f2cb18 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -46,11 +47,13 @@ public:
 virtual void tearDown();
 void testZoom();
 void testFdo38176();
+void testFdo49683();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
 CPPUNIT_TEST(testZoom);
 CPPUNIT_TEST(testFdo38176);
+CPPUNIT_TEST(testFdo49683);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -127,6 +130,18 @@ void Test::testFdo38176()
 CPPUNIT_ASSERT_EQUAL(9, getLength());
 }
 
+void Test::testFdo49683()
+{
+roundtrip("fdo49683.rtf");
+
+uno::Reference 
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xDocumentProperties(xDocumentPropertiesSupplier->getDocumentProperties());
+uno::Sequence aKeywords(xDocumentProperties->getKeywords());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aKeywords.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("one"), aKeywords[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("two"), aKeywords[1]);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index b7df627..7354306 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_defs,rtftok,\
 ))
 
 $(eval $(call gb_Library_use_libraries,rtftok,\
+   comphelper \
cppu \
cppuhelper \
msfilter \
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 957174e..93b2812 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include  // NS_sprm namespace
 #include  // NS_rtf namespace
@@ -931,6 +932,7 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_FORMFIELDLIST:
 case DESTINATION_DATAFIELD:
 case DESTINATION_AUTHOR:
+case DESTINATION_KEYWORDS:
 case DESTINATION_OPERATOR:
 case DESTINATION_COMPANY:
 case DESTINATION_COMMENT:
@@ -1306,6 +1308,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_AUTHOR:
 m_aStates.top().nDestinationState = DESTINATION_AUTHOR;
 break;
+case RTF_KEYWORDS:
+m_aStates.top().nDestinationState = DESTINATION_KEYWORDS;
+break;
 case RTF_OPERATOR:
 m_aStates.top().nDestinationState = DESTINATION_OPERATOR;
 break;
@@ -3242,6 +3247,8 @@ int RTFDocumentImpl::popState()
 m_xDocumentProperties->setPrintDate(lcl_getDateTime(m_aStates));
 else if (m_aStates.top().nDestinationState == DESTINATION_AUTHOR && 
m_xDocumentProperties.is())
 
m_xDocumentProperties->setAuthor(m_aStates.top().aDestinationText.makeStringAndClear());
+else if (m_aStates.top().nDestinationState == DESTINATION_KEYWORDS && 
m_xDocumentProperties.is())
+
m_xDocumentProperties->setKeywords(comphelper::string::convertCommaSeparated(m_aStates.top().aDestinationText.makeStringAndClear()));
 else if (m_aStates.top().nDestinationState == DESTINATION_COMMENT && 
m_xDocumentProperties.is())
 
m_xDocumentProperties->setGenerator(m_aStates.top().aDestinationText.makeStringAndClear());
 else if (m_aStates.top().nDestinationState == DESTINATION_OPERATOR
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 1c7b9ec..2e23b0d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -100,6 +100,7 @@ namespace writerfilter {
 DESTINATION_REVISIONTIME,
 DESTINATION_PRINTTIME,
 DESTINATION_AUTHOR,
+DESTINATI

[Libreoffice-commits] .: sw/source

 sw/source/core/crsr/bookmrk.cxx   |4 +++-
 sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f4f526e08cfe9f938aa3422da80dc60f2e1ec3da
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 13:20:01 2012 +0100

Resolves: fdo#38071 improve multi-line form field text ranges

Change-Id: I40d32a34499661de562ae2160193ccf5e41d9465

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index bd5c50f..b177ee1 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -118,9 +118,11 @@ namespace sw { namespace mark
 }
 }
 
+//We consider the CH_TXT_ATR_FIELDSTART and CH_TXT_ATR_FIELDEND
+//themselves to be part of the covered range
 bool MarkBase::IsCoveringPosition(const SwPosition& rPos) const
 {
-return GetMarkStart() <= rPos && rPos < GetMarkEnd();
+return rPos >= GetMarkStart() && rPos <= GetMarkEnd();
 }
 
 void MarkBase::SetMarkPos(const SwPosition& rNewPos)
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 1ce0245..13384b7 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1880,8 +1880,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& 
rNode )
 }
 else if ( ch == CH_TXT_ATR_FIELDEND )
 {
-SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* 
>( &rNode ), nAktPos - 1 ) );
+SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* 
>( &rNode ), nAktPos ) );
 ::sw::mark::IFieldmark const * const pFieldmark = 
pMarkAccess->getFieldmarkFor( aPosition );
+
 OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; 
where is the Fieldmark for the FIELDEND??" );
 
 ww::eField eFieldId = lcl_getFieldId( pFieldmark );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] fix basic IDE highlighting issue ...

2012-05-09 Thread Noel Power


On 08/05/12 21:26, Michael Meeks wrote:

Another malingering bug / patch:

https://bugs.freedesktop.org/show_bug.cgi?id=36541
patch:
https://bugs.freedesktop.org/attachment.cgi?id=46070

Thanks :-)

Michael.

not familiar with the ide syntax highlighting so some patience needed 
while I try to understand what's going on


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

Re: [PUSHED][PATCH] crash on export of multi line form text fields to .doc

On Tue, 2012-05-08 at 14:53 +0100, Michael Meeks wrote:
>   Some famous hacker appears to have had a nice fix pending since
> 2011-06 ;-)
> 
>   https://bugs.freedesktop.org/show_bug.cgi?id=38071

Seems sane, pushed.

C.

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

[Libreoffice-commits] .: icon-themes/tango

 icon-themes/tango/res/lc05504.png |binary
 icon-themes/tango/res/lc05509.png |binary
 icon-themes/tango/res/sc05504.png |binary
 icon-themes/tango/res/sc05509.png |binary
 4 files changed

New commits:
commit 01d3f16e2a4c540b65368a1a94248e324f1d0f73
Author: Ivan Timofeev 
Date:   Wed May 9 16:01:55 2012 +0400

fdo#45698 - Inconsistent 'Print' icons in Tango theme

Change-Id: I1b992b6baf1840ada6b9ad29701a033454962d98

diff --git a/icon-themes/tango/res/lc05504.png 
b/icon-themes/tango/res/lc05504.png
index 36b443a..8e181a0 100644
Binary files a/icon-themes/tango/res/lc05504.png and 
b/icon-themes/tango/res/lc05504.png differ
diff --git a/icon-themes/tango/res/lc05509.png 
b/icon-themes/tango/res/lc05509.png
index 36b443a..8e181a0 100644
Binary files a/icon-themes/tango/res/lc05509.png and 
b/icon-themes/tango/res/lc05509.png differ
diff --git a/icon-themes/tango/res/sc05504.png 
b/icon-themes/tango/res/sc05504.png
index 4ffb8a7..56c5c83 100644
Binary files a/icon-themes/tango/res/sc05504.png and 
b/icon-themes/tango/res/sc05504.png differ
diff --git a/icon-themes/tango/res/sc05509.png 
b/icon-themes/tango/res/sc05509.png
index 4ffb8a7..56c5c83 100644
Binary files a/icon-themes/tango/res/sc05509.png and 
b/icon-themes/tango/res/sc05509.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: should global keyboard shortcuts override sidepane mnemonics?

2012-05-09 Thread Cor Nouws



Thorsten Behrens wrote (09-05-12 09:09)


If you find the bug again, do tell. ;)


Well, if you really insist ;-)

My focus annoyances issues:
-  [Bug 43822] Ctrl-W does not close document when the focus is in the 
Navigator (Writer)
-  [Bug 49684] the Navigator gets the focus when starting a new document 
while the Navigator is open (Writer)
-  [Bug 49685] When starting or Opening presentation the focus is not 
one the slide, but somewhere in the task pane (Impress)




And well, having keyboard focus there is not bad - having it there
_initially_ is. :)


Yup!

--
 - Cor
 - http://nl.libreoffice.org

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

Re: [PUSHED-3-5] Revert "Set the listbox height to an integer multiple of the listbox entry height"

On 09.05.2012 15:06, Michael Meeks wrote:

On Mon, 2012-05-07 at 22:55 +0400, Ivan Timofeev wrote:

this patch reverts commit
http://cgit.freedesktop.org/libreoffice/core/commit/?id=16c9d63da67897e51960f3684d8d05b06f2c8f81
Quote:
"This ensures that we don't get a half visible entry at the bottom of
the view."

I think Luke did that for some annoying problems in the presenter view
where we have this side-panel with an incomplete / partial list of
transitions and/or other bits; which caused some interaction annoyance;
but I guess this needs to be done at a higher level there. Then again -
Cor reported problems there somehow.

Hmm, maybe this is annoying. But what if we would just draw a border
around the control. See the attached image. Not so annoying now, right?

Opinions from the UX point of view? :) Do we really need to shrink a
listbox so that it does not show a partially visible item at the bottom,
or adding a border is enough?

Actually that creates some problems:
1. Some listboxes get too small so that it's impossible to use the
scrollbar.[1]
2. Just open the LibreOffice file picker and resize it. Notice the ugly
gray space between the bottom of the listbox and the bottom of the
decoration.

I just reverted it on 3-5; thanks for that.

Yes, I can make the current behavior optional and use it somewhere. But
where?..

That'd be good I guess :-) It'd be good to get a description of the
problem in the bug, so we can improve the slideshow as well as the
file-selector.

The file-selector is ok now, let's find a solution for Impress' slide
transitions list right here...

Regards,
Ivan
<>___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: officecfg/registry sfx2/source sw/source tools/inc tools/Library_tl.mk tools/Package_inc.mk tools/source

2012-05-09 Thread Stephan Bergmann

 officecfg/registry/data/org/openoffice/Office/Paths.xcu |6 
 sfx2/source/appl/app.cxx|1 
 sfx2/source/appl/appinit.cxx|1 
 sfx2/source/appl/appserv.cxx|1 
 sw/source/filter/basflt/fltini.cxx  |7 
 tools/Library_tl.mk |1 
 tools/Package_inc.mk|1 
 tools/inc/tools/svlibrary.hxx   |   44 -
 tools/source/generic/svlibrary.cxx  |  130 
 9 files changed, 4 insertions(+), 188 deletions(-)

New commits:
commit 2b0244db8b223780e9d740ac600b7e25a2c11d93
Author: Stephan Bergmann 
Date:   Wed May 9 13:46:19 2012 +0200

Removed unnecessary SvLibrary

Change-Id: I42e64af8ed88e652341707d5f9d2da3daaa0f9bb

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu 
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 1bf90f2..b6092e4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -98,12 +98,6 @@
 
 
 
-
-  
-
-  
-
-
 
 
  
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index b39243b..74a5a71 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -106,7 +106,6 @@
 #include "sfx2/stbitem.hxx"
 #include "eventsupplier.hxx"
 #include 
-#include 
 
 #ifdef DBG_UTIL
 #include 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 48dbcdf..08e6a78 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -74,7 +74,6 @@
 #include 
 #include "helper.hxx"   // SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
-#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d39bc40..1287df6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -124,7 +124,6 @@
 #include 
 #include "sorgitm.hxx"
 #include "sfx2/sfxhelp.hxx"
-#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index 2fe88b7..35e7d2f 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -67,7 +67,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace utl;
 using rtl::OUString;
@@ -162,9 +161,11 @@ Filters::~Filters()
 
 oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol )
 {
-static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( 
"msword" ) ) );
 if (!msword_.is())
-SvLibrary::LoadModule( msword_, aLibName, &thisModule, 
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+{
+bool ok = msword_.loadRelative( &thisModule, SVLIBRARY( "msword" ), 
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
+SAL_WARN_IF(!ok, "sw", "failed to load msword library");
+}
 if (msword_.is())
 return msword_.getFunctionSymbol( ::rtl::OUString::createFromAscii( 
pSymbol ) );
 return NULL;
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 975574f..b8cb8f4 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
 tools/source/generic/poly2 \
 tools/source/generic/svborder \
 tools/source/generic/toolsin \
-tools/source/generic/svlibrary \
 tools/source/inet/inetmime \
 tools/source/inet/inetmsg \
 tools/source/inet/inetstrm \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 46b829f..58c8270 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -82,7 +82,6 @@ $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
-$(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
 $(eval $(call 
gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
diff --git a/tools/inc/tools/svlibrary.hxx b/tools/inc/tools/svlibrary.hxx
deleted file mode 100644
index b10adde..000
--- a/tools/inc/tools/svlibrary.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES

[Libreoffice-commits] .: sd/source

 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |2 +-
 sd/source/ui/toolpanel/ToolPanelViewShell.cxx   |2 +-
 sd/source/ui/view/drviewsa.cxx  |3 +--
 sd/source/ui/view/outlnvsh.cxx  |4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 12:39:28 2012 +0100

Resolves: rhbz#805743 a11y: call doShow after we have a valid view

Basically a regression from ec240eafe9b25620383aa54015f5c55e0f64227a but 
things
were broken before that too.

enable a11y (for gnome 3 this is gsettings set org.gnome.desktop.interface
toolkit-accessibility true), and run the smoketest with dbg-util before
touching this stuff

Change-Id: I I55f4e22d8ac61c7ac3ccc37b82794604b28a8f14

diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index a9b09a9..7b874c0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -186,7 +186,7 @@ void SlideSorterViewShell::Initialize (void)
 mpScrollBarBox);
 mpView = &mpSlideSorter->GetView();
 
-ViewShell::doShow();
+doShow();
 
 SetPool( &GetDoc()->GetPool() );
 SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() );
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx 
b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 12f6515..8eb9bc7 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -482,7 +482,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* 
pFrame, ViewShellBase& rVi
 ,mpSubShellManager()
 ,mnMenuId(0)
 {
-ViewShell::doShow();
+doShow();
 
 meShellType = ST_TASK_PANE;
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 0d1b5ac..1dabda6 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -137,13 +137,12 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, 
ViewShellBase& rViewShellBas
 , mbIsLayerModeActive(false)
 , mbIsInSwitchPage(false)
 {
-ViewShell::doShow();
-
 if (pFrameViewArgument != NULL)
 mpFrameView = pFrameViewArgument;
 else
 mpFrameView = new FrameView(GetDoc());
 Construct(GetDocSh(), ePageKind);
+doShow();
 }
 
 /*
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 4f13989..f37b7a0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -222,8 +222,6 @@ OutlineViewShell::OutlineViewShell (
   mbInitialized(false)
 
 {
-ViewShell::doShow();
-
 if (pFrameViewArgument != NULL)
 mpFrameView = pFrameViewArgument;
 else
@@ -232,6 +230,8 @@ OutlineViewShell::OutlineViewShell (
 mpFrameView->Connect();
 
 Construct(GetDocSh());
+
+doShow();
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED-3-5] Hardcode cairo canvas off for Mac OS X and Windows

On Wed, 2012-05-09 at 10:14 +0300, Tor Lillqvist wrote:
> Do we really need to cherry-pick just build mechanism fixes? I mean,
> we already have builds for Windows that are configured correctly.

Riight - of course, relying on human beings not to screw up their
configure options while improving something else is a risky business.

I just cherry-picked the simple:

"bomb during build if cairo is not disabled on Windows / Mac"

patch; better to fail early there. No doubt that will bust a -3-5
tinderbox or two ;-) I used you as a sign-off Korrawit - hope that's ok,
and it should pragmatically solve the problem for now.

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-5' - canvas/source

 canvas/source/cairo/cairo_services.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 284fd74d34c0185743efbc19f1f7f3422e49835a
Author: Michael Meeks 
Date:   Mon Apr 23 16:58:59 2012 +0100

bomb out compilation of cairo canvas for mac or windows

This is to avoid unintended regressions based on configure options.

Signed-off-by: Korrawit Pruegsanusak 

diff --git a/canvas/source/cairo/cairo_services.cxx 
b/canvas/source/cairo/cairo_services.cxx
index 9f99f27..ef86102 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -47,6 +47,10 @@
 
 using namespace ::com::sun::star;
 
+#if defined(WNT) || defined (MACOSX)
+#  error "The cairo canvas should not be enabled on Windows or Mac cf 
fdo#46901"
+#endif
+
 namespace cairocanvas
 {
 static uno::Reference initCanvas( Canvas* pCanvas )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/ui/misc/glossary.cxx |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

New commits:
commit f802b568d639950c2f8005cf143fd628cc29a3a0
Author: Brad Sowden 
Date:   Thu Jan 5 23:55:18 2012 +1300

AutoText: fix segfault when delete/rename action applied while group 
selected.

In the Edit -> AutoText dialog, if an entry is selected and then a group
selected the delete/rename/etc actions are still shown in the "AutoText" 
menu
when they should not be. These actions are only applicable to entries and if
a user attempts to apply these actions while a group is selected the list 
box
becomes corrupted and leads to a segfault (the code for these actions
assumes the selected entry has a parent in the listbox).

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index ce888c1..044402b 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -449,25 +449,23 @@ IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, 
SvTreeListBox*, pBox )
 
 IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn )
 {
+SvLBoxEntry* pEntry = aCategoryBox.FirstSelected();
+
 const String aEditText(aNameED.GetText());
 const sal_Bool bHasEntry = aEditText.Len() && 
aShortNameEdit.GetText().Len();
 const sal_Bool bExists = 0 != DoesBlockExist(aEditText, 
aShortNameEdit.GetText());
+const sal_Bool bIsGroup = pEntry && !aCategoryBox.GetParent(pEntry);
 pMn->EnableItem(FN_GL_DEFINE, bSelection && bHasEntry && !bExists);
 pMn->EnableItem(FN_GL_DEFINE_TEXT, bSelection && bHasEntry && !bExists);
-pMn->EnableItem(FN_GL_COPY_TO_CLIPBOARD, bExists);
-pMn->EnableItem(FN_GL_REPLACE, bSelection && bExists && !bIsOld );
-pMn->EnableItem(FN_GL_REPLACE_TEXT, bSelection && bExists && !bIsOld );
-pMn->EnableItem(FN_GL_EDIT, bExists );
-pMn->EnableItem(FN_GL_RENAME, bExists  );
-pMn->EnableItem(FN_GL_DELETE, bExists  );
-pMn->EnableItem(FN_GL_MACRO, bExists && !bIsOld  &&
+pMn->EnableItem(FN_GL_COPY_TO_CLIPBOARD, bExists && !bIsGroup);
+pMn->EnableItem(FN_GL_REPLACE, bSelection && bExists && !bIsGroup && 
!bIsOld );
+pMn->EnableItem(FN_GL_REPLACE_TEXT, bSelection && bExists && !bIsGroup && 
!bIsOld );
+pMn->EnableItem(FN_GL_EDIT, bExists && !bIsGroup );
+pMn->EnableItem(FN_GL_RENAME, bExists && !bIsGroup );
+pMn->EnableItem(FN_GL_DELETE, bExists && !bIsGroup );
+pMn->EnableItem(FN_GL_MACRO, bExists && !bIsGroup && !bIsOld &&
 !pGlossaryHdl->IsReadOnly() );
-
-SvLBoxEntry* pEntry = aCategoryBox.FirstSelected();
-sal_Bool bEnable = sal_False;
-if ( pEntry )
-bEnable = !aCategoryBox.GetParent( pEntry ) && !bIsOld && 
!pGlossaryHdl->IsReadOnly();
-pMn->EnableItem( FN_GL_IMPORT, bEnable );
+pMn->EnableItem( FN_GL_IMPORT, bIsGroup && !bIsOld && 
!pGlossaryHdl->IsReadOnly() );
 return 1;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

 sw/qa/extras/rtftok/rtftok.cxx |   32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 93a7ad0b686ec772a3988256a7856f2130cf8ae7
Author: Miklos Vajna 
Date:   Wed May 9 12:51:01 2012 +0200

rtftok test: clean up by introducing getStyles() helper

Change-Id: I5759d748efb1ed0aa0376de50eb16ba10e63c280

diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index e6de843..8b41569 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -139,6 +139,7 @@ private:
 int getLength();
 /// Get page count.
 int getPages();
+uno::Reference getStyles(OUString aFamily);
 uno::Reference mxComponent;
 };
 
@@ -175,6 +176,14 @@ int Test::getPages()
 return xCursor->getPage();
 }
 
+uno::Reference Test::getStyles(OUString aFamily)
+{
+uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xPageStyles(xStyles->getByName(aFamily), uno::UNO_QUERY);
+return xPageStyles;
+}
+
 void Test::setUp()
 {
 test::BootstrapFixture::setUp();
@@ -332,10 +341,7 @@ void Test::testFdo46662()
 {
 load("fdo46662.rtf");
 
-uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
-uno::Reference 
xNumberingStyles(xStyles->getByName("NumberingStyles"), uno::UNO_QUERY);
-uno::Reference 
xPropertySet(xNumberingStyles->getByName("WWNum3"), uno::UNO_QUERY);
+uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum3"), uno::UNO_QUERY);
 uno::Reference 
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
 uno::Sequence aProps;
 xLevels->getByIndex(1) >>= aProps; // 2nd level
@@ -487,10 +493,7 @@ void Test::testFdo45394()
 {
 load("fdo45394.rtf");
 
-uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
-uno::Reference 
xPageStyles(xStyles->getByName("PageStyles"), uno::UNO_QUERY);
-uno::Reference 
xPropertySet(xPageStyles->getByName("Default"), uno::UNO_QUERY);
+uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY);
 uno::Reference 
xHeaderText(xPropertySet->getPropertyValue("HeaderText"), uno::UNO_QUERY);
 OUString aActual = xHeaderText->getString();
 // Encoding in the header was wrong.
@@ -512,9 +515,7 @@ void Test::testFdo47107()
 {
 load("fdo47107.rtf");
 
-uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
-uno::Reference 
xNumberingStyles(xStyles->getByName("NumberingStyles"), uno::UNO_QUERY);
+uno::Reference 
xNumberingStyles(getStyles("NumberingStyles"));
 // Make sure numbered and bullet legacy syntax is recognized, this used to 
throw a NoSuchElementException
 xNumberingStyles->getByName("WWNum1");
 xNumberingStyles->getByName("WWNum2");
@@ -536,9 +537,7 @@ void Test::testFdo44176()
 {
 load("fdo44176.rtf");
 
-uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
-uno::Reference 
xPageStyles(xStyles->getByName("PageStyles"), uno::UNO_QUERY);
+uno::Reference 
xPageStyles(getStyles("PageStyles"));
 uno::Reference 
xFirstPage(xPageStyles->getByName("First Page"), uno::UNO_QUERY);
 uno::Reference 
xDefault(xPageStyles->getByName("Default"), uno::UNO_QUERY);
 sal_Int32 nFirstTop = 0, nDefaultTop = 0, nDefaultHeader = 0;
@@ -707,10 +706,7 @@ void Test::testFdo49501()
 {
 load("fdo49501.rtf");
 
-uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
-uno::Reference 
xPageStyles(xStyles->getByName("PageStyles"), uno::UNO_QUERY);
-uno::Reference 
xStyle(xPageStyles->getByName("Default"), uno::UNO_QUERY);
+uno::Reference 
xStyle(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY);
 
 sal_Bool bIsLandscape = sal_False;
 xStyle->getPropertyValue("IsLandscape") >>= bIsLandscape;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED-3-5] Revert "Set the listbox height to an integer multiple of the listbox entry height"

On Mon, 2012-05-07 at 22:55 +0400, Ivan Timofeev wrote:
> this patch reverts commit
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=16c9d63da67897e51960f3684d8d05b06f2c8f81
> Quote:
> "This ensures that we don't get a half visible entry at the bottom of 
> the view."

I think Luke did that for some annoying problems in the presenter view
where we have this side-panel with an incomplete / partial list of
transitions and/or other bits; which caused some interaction annoyance;
but I guess this needs to be done at a higher level there. Then again -
Cor reported problems there somehow.

> Actually that creates some problems:
> 1. Some listboxes get too small so that it's impossible to use the 
> scrollbar.[1]
> 2. Just open the LibreOffice file picker and resize it. Notice the ugly 
> gray space between the bottom of the listbox and the bottom of the 
> decoration.

I just reverted it on 3-5; thanks for that.

> Yes, I can make the current behavior optional and use it somewhere. But 
> where?..

That'd be good I guess :-) It'd be good to get a description of the
problem in the bug, so we can improve the slideshow as well as the
file-selector.

Thanks !

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-5' - svtools/source

 svtools/source/contnr/svimpbox.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit f78b1646551543202a11a1e758f6c00a04ecdbdc
Author: Ivan Timofeev 
Date:   Mon May 7 22:31:34 2012 +0400

Revert "Set the listbox height to an integer multiple of the listbox 
entry...

This reverts commit 16c9d63da67897e51960f3684d8d05b06f2c8f81.

Conflicts:

svtools/source/contnr/svimpbox.cxx

Change-Id: I8e030e3b85fbf31d8369646e55048b830a83486e
Signed-off-by: Michael Meeks 

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 603730f..2c9066d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1355,18 +1355,8 @@ void SvImpLBox::InitScrollBarBox()
 void SvImpLBox::Resize()
 {
 Size aSize( pView->Control::GetOutputSizePixel());
-long nEntryHeight = pView->GetEntryHeight();
-
 if( aSize.Width() <= 0 || aSize.Height() <= 0 )
 return;
-if( nEntryHeight )
-{
-  // Set the view height to an integer multiple of the entry height.
-  int nEntryCount = (int) aSize.Height() / nEntryHeight;
-  aSize.Height() = pView->GetEntryHeight() * nEntryCount;
-  pView->Control::SetOutputSizePixel( aSize );
-}
-
 nFlags |= F_IN_RESIZE;
 InitScrollBarBox();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/win

2012-05-09 Thread Tor Lillqvist

 vcl/win/source/app/salinst.cxx |2 --
 vcl/win/source/app/salshl.cxx  |4 
 vcl/win/source/gdi/salgdi3.cxx |5 -
 3 files changed, 11 deletions(-)

New commits:
commit a4d77bafb6211481acd4e4b633639ec6bf3f25a3
Author: Tor Lillqvist 
Date:   Wed May 9 13:45:58 2012 +0300

This is Windows code so bin pointless #ifdef WNT

Change-Id: I8e81ecd0e78f22f09db4288b781ae5f5da4d8760

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index be70008..e80ff80 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -28,10 +28,8 @@
 
 
 #include 
-#ifdef WNT
 #include 
 #include 
-#endif
 
 #include 
 #include 
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 8e7c0b9..486ce04 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -37,8 +37,6 @@ SalShlData aSalShlData;
 
 // ===
 
-#ifdef WNT
-
 extern "C"
 {
 
@@ -73,8 +71,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID 
pReserved )
 
 }
 
-#endif
-
 // ===
 
 HCURSOR ImplLoadSalCursor( int nId )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 79ff375..a22ab47 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1067,16 +1067,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& 
rLogFont, Font& rFont )
 static FILE * grLogFile = NULL;
 static FILE * grLog()
 {
-#ifdef WNT
 std::string logFileName(getenv("TEMP"));
 logFileName.append("\\grface.log");
 if (grLogFile == NULL) grLogFile = fopen(logFileName.c_str(),"w");
 else fflush(grLogFile);
 return grLogFile;
-#else
-fflush(stdout);
-return stdout;
-#endif
 }
 #undef NDEBUG
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - vcl/inc vcl/win

2012-05-09 Thread Tor Lillqvist

 vcl/inc/win/salgdi.h |7 -
 vcl/win/source/gdi/salgdi3.cxx   |9 ---
 vcl/win/source/gdi/winlayout.cxx |   50 ++-
 3 files changed, 3 insertions(+), 63 deletions(-)

New commits:
commit 96f79ea7c326db138aa3188e129c6e9b4d78cbaa
Author: Tor Lillqvist 
Date:   Wed May 9 13:33:19 2012 +0300

GNG_VERT_HACK has been hardcoded since 2004, so why bother with ifdefs

Change-Id: I629a8af49d95b46390e5fe72f44f92a89379b57a

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 1f279f3..698bf57 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -53,10 +53,6 @@ class ImplFontAttrCache;
 #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x0200)
 #define PALRGB_TO_RGB(nPalRGB)  ((nPalRGB)&0x00ff)
 
-// win32 platform specific options. Move them to the PMK file?
-
-#define GNG_VERT_HACK
-
 #ifdef ENABLE_GRAPHITE
 class RawFontData;
 class GrFontData
@@ -144,7 +140,6 @@ private:
 voidReadCmapTable( HDC ) const;
 voidGetFontCapabilities( HDC hDC ) const;
 
-#ifdef GNG_VERT_HACK
 voidReadGsubTable( HDC ) const;
 
 typedef boost::unordered_set UcsHashSet;
@@ -153,7 +148,6 @@ private:
 public:
 boolHasGSUBstitutions( HDC ) const;
 boolIsGSUBstituted( sal_UCS4 ) const;
-#endif // GNG_VERT_HACK
 };
 
 // --
commit 0947d09c8aa71e5c413a3b637d6402b0f41239e1
Author: Tor Lillqvist 
Date:   Wed May 9 13:30:11 2012 +0300

GCP_KERN_HACK has been hardcoded since 2002, so why bother with ifdefs

Change-Id: I7e37289aba503310c54026d5a8bcbf8e4d51fb6c

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 974d16c..1f279f3 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -55,7 +55,6 @@ class ImplFontAttrCache;
 
 // win32 platform specific options. Move them to the PMK file?
 
-#define GCP_KERN_HACK
 #define GNG_VERT_HACK
 
 #ifdef ENABLE_GRAPHITE
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 4d866f9..79ff375 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -69,9 +69,7 @@
 #include "outdev.h" // for ImplGlyphFallbackFontSubstitution
 #include "sft.hxx"
 
-#ifdef GCP_KERN_HACK
 #include 
-#endif
 
 #ifdef ENABLE_GRAPHITE
 #include 
@@ -1797,17 +1795,10 @@ sal_uLong WinSalGraphics::GetKernPairs( sal_uLong 
nPairs, ImplKernPairData* pKer
 int nCount = ::GetKerningPairsW( mhDC, 0, NULL );
 if( nCount )
 {
-#ifdef GCP_KERN_HACK
 pPairs = new KERNINGPAIR[ nCount+1 ];
 mpFontKernPairs = pPairs;
 mnFontKernPairCount = nCount;
 ::GetKerningPairsW( mhDC, nCount, pPairs );
-#else // GCP_KERN_HACK
-pPairs = pKernPairs;
-nCount = (nCount < nPairs) : nCount : nPairs;
-::GetKerningPairsW( mhDC, nCount, pPairs );
-return nCount;
-#endif // GCP_KERN_HACK
 }
 
 mbFontKernInit = FALSE;
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index db52d43..72f9cf3 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -48,9 +48,7 @@
 #define alloca _alloca
 #endif
 
-#ifdef GCP_KERN_HACK
-#include 
-#endif // GCP_KERN_HACK
+#include 
 
 #include 
 #include 
@@ -87,7 +85,6 @@ public:
 private:
 // TODO: also add HFONT??? Watch out for issues with too many active 
fonts...
 
-#ifdef GCP_KERN_HACK
 public:
 boolHasKernData() const;
 voidSetKernData( int, const KERNINGPAIR* );
@@ -95,7 +92,6 @@ public:
 private:
 KERNINGPAIR*mpKerningPairs;
 int mnKerningPairs;
-#endif // GCP_KERN_HACK
 
 public:
 SCRIPT_CACHE&   GetScriptCache() const
@@ -389,13 +385,6 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
 if( rArgs.mnFlags & (SAL_LAYOUT_KERNING_PAIRS | SAL_LAYOUT_KERNING_ASIAN) )
 mpGlyphOrigAdvs = new int[ mnGlyphCount ];
 
-#ifndef GCP_KERN_HACK
-DWORD nGcpOption = 0;
-// enable kerning if requested
-if( rArgs.mnFlags & SAL_LAYOUT_KERNING_PAIRS )
-nGcpOption |= GCP_USEKERNING;
-#endif // GCP_KERN_HACK
-
 for( i = 0; i < mnGlyphCount; ++i )
 mpOutGlyphs[i] = pBidiStr[ i ];
 mnWidth = 0;
@@ -478,18 +467,11 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
 mpGlyphOrigAdvs[i] = mnNotdefWidth;
 }
 
-#ifdef GCP_KERN_HACK
 // apply kerning if the layout engine has not yet done it
 if( rArgs.mnFlags & (SAL_LAYOUT_KERNING_ASIAN|SAL_LAYOUT_KERNING_PAIRS) )
 {
-#else // GCP_KERN_HACK
-// apply just asian kerning
-if( rArgs.mnFlags & SAL_LAYOUT_KERNING_ASIAN )
-{
-if( !(rArgs.mnFlags & SAL_LAYOUT_KERNING_PAIRS) )
-#endif // GCP_KERN_HACK
-for( i = 0; i < mnGlyphCount;

[Libreoffice-commits] .: 2 commits - canvas/source sfx2/source

 canvas/source/cairo/cairo_xlib_cairo.cxx |   20 +++-
 sfx2/source/doc/sfxbasemodel.cxx |3 +++
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit a1d265be484f1c70f57ab3de9b2d8c27d2fd3aa4
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 11:32:05 2012 +0100

Resolves: rhbz#818557 crash with NULL shell post template update

It's all a bit baffling in a maze of Shells, but what I can see is that
when we update from the template at the end of loading we end up with
a different order of shells on the stack than in the usual case.
Apparently from positioning the cursor at an earlier stage than usual.

If I lock the dispatcher for the duration of updating the template it all 
works
out ok. I freely admit I can't foresee the full consequences of this, but it
appears to work.

Change-Id: Ib7b2f511cdb5a37715a6ad839d9b1426ad9db8e0

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 02a4b9a..b3792d9 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1198,7 +1198,10 @@ void SAL_CALL SfxBaseModel::connectController( const 
uno::Reference< frame::XCon
 {
 SfxViewFrame* pViewFrame = SfxViewFrame::Get( xController, 
GetObjectShell() );
 ENSURE_OR_THROW( pViewFrame, "SFX document without SFX view!?" );
+bool bOldLock = pViewFrame->GetDispatcher()->IsLocked();
+pViewFrame->GetDispatcher()->Lock(sal_True);
 pViewFrame->UpdateDocument_Impl();
+pViewFrame->GetDispatcher()->Lock(bOldLock);
 const String sDocumentURL = GetObjectShell()->GetMedium()->GetName();
 if ( sDocumentURL.Len() )
 SFX_APP()->Broadcast( SfxStringHint( SID_OPENURL, sDocumentURL ) );
commit 107f8447818e50ba61221ca2ab0871347b7d6596
Author: CaolÃ¡n McNamara 
Date:   Wed May 9 09:17:42 2012 +0100

Related: fdo#48961 don't crash on silly pixmap sizes

Change-Id: I43dbe846160d19b203ad6bed06e807d4fbf7ce56

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index df14fce..0259154 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -40,6 +40,24 @@
 #include 
 #include 
 
+namespace
+{
+Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int 
width, unsigned int height, unsigned int depth)
+{
+// The X protocol request CreatePixmap puts an upper bound
+// of 16 bit to the size.
+//
+// see, e.g. moz#424333, fdo#48961
+// we've a duplicate of this in vcl :-(
+if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16)
+{
+SAL_WARN("canvas", "overlarge pixmap: " << width << " x " << 
height);
+return None;
+}
+return XCreatePixmap(display, d, width, height, depth);
+}
+}
+
 namespace cairo
 {
 
@@ -232,7 +250,7 @@ namespace cairo
 }
 
 pFormat = XRenderFindStandardFormat( (Display*)maSysData.pDisplay, 
nFormat );
-hPixmap = XCreatePixmap( (Display*)maSysData.pDisplay, 
maSysData.hDrawable,
+hPixmap = limitXCreatePixmap( (Display*)maSysData.pDisplay, 
maSysData.hDrawable,
  width > 0 ? width : 1, height > 0 ? 
height : 1,
  pFormat->depth );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] SVG Export - Presentation placeholder texts are exported

2012-05-09 Thread Thorsten Behrens

Marco Cecchetti wrote:
> Well, it depends. If exporting a TitleTextPage or an OutlinerShape
> presents on a master page is a bug, the patch is not obsolete
> because it is still the way it works.
>
Hi Marco, all,

yes, I believe this is a bug - for reference, see

 slideshow/source/engine/shapes/shapeimporter.cxx: ShapeImporter::isSkip()

for how slideshow determines visibility of objects. Prolly best to
factor that out of slideshow somehow, and e.g. stick it into
animations/source/animcore/* (for lack of a better place).

Cheers,

-- Thorsten


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

build error on master in SVX module, in SvxUnoTextField method

2012-05-09 Thread Noel Grandin


Hi

I'm getting a link error when building master on Windows7

Any ideas?

Thanks, Noel Grandin

[ build CHK ] hwpfilter
   Creating library 
D:/workdir/wntmsci12.pro/LinkTarget/Library/isvxcore.lib and object 
D:/workdir/wntmsci12.pro/LinkTarget/Library/isvxcore.exp

[ build CHK ] sdext
unomod.o : error LNK2001: unresolved external symbol "public: virtual 
long __thiscall ::GetFieldId(class SvxFieldData const *)const " 
(?GetFieldId@SvxUnoTextField@@UBEJPBVSvxFieldData@@@Z)
D:/workdir/wntmsci12.pro/LinkTarget/Library/svxcorelo.dll : fatal error 
LNK1120: 1 unresolved externals

[ build CHK ] svtools
Microsoft (R) Manifest Tool version 5.2.3790.2076
Copyright (c) Microsoft Corporation 2005.
All rights reserved.

mt.exe : general error c10100b1: Failed to load file 
"D:/workdir/wntmsci12.pro/LinkTarget/Library/svxcorelo.dll". The system 
cannot find the file specified.
make[1]: *** [D:/workdir/wntmsci12.pro/LinkTarget/Library/isvxcore.lib] 
Error 96

make[1]: *** Waiting for unfinished jobs
make: *** [tail_build] Error 2


Disclaimer: http://www.peralex.com/disclaimer.html


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

[PUSHED-3-5] fdo#39106: properly draw separators in vertical toolbars

Hi Ivan,

On Wed, 2012-05-09 at 12:50 +0400, Ivan Timofeev wrote:
> attached a simplified fix for
> https://bugs.freedesktop.org/show_bug.cgi?id=39106

Great - it looks like it busts other backends to use native rendering
for separators - but then it's only the gtk+ backend that does this; the
fix on master looks lovely too.

Thanks !

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-5' - 2 commits - dbaccess/source vcl/source

 dbaccess/source/core/misc/dsntypes.cxx |2 +-
 vcl/source/window/toolbox.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f17ceb9b6d6dc16a2b276a6e81aa674d87d137e1
Author: Ivan Timofeev 
Date:   Wed May 9 12:40:23 2012 +0400

fdo#39106: properly draw separators in vertical toolbars

Change-Id: If99fdb01a472e488ab6d84b09f1d1db04ba5c000
Signed-off-by: Michael Meeks 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0ae1ccb..9da3a7a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3239,7 +3239,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, 
Rectangle rRect )
 bool bNativeOk = false;
 ImplToolItem* pItem = &mpData->m_aItems[nPos];
 
-if( IsNativeControlSupported( CTRL_TOOLBAR, PART_SEPARATOR ) )
+if( IsHorizontal() && IsNativeControlSupported( CTRL_TOOLBAR, 
PART_SEPARATOR ) )
 {
 ImplControlValueaControlValue;
 ControlStatenState = 0;
commit 4a2a500391734f02f9e27c06b5971e670411bdff
Author: Lionel Elie Mamane 
Date:   Thu Feb 9 22:20:12 2012 +0100

fdo#45580 crash on "connect to existing database" wizard

Signed-off-by: Michael Meeks 

diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index ec1041b..324e2e5 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -172,7 +172,7 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const 
::rtl::OUString& _sURL) c
 sOldPattern = *aIter;
 }
 }
-return sRet.GetChar(sRet.Len()-1) == '*';
+return sRet.Len() > 0 && sRet.GetChar(sRet.Len()-1) == '*';
 }
 // 
-
 String ODsnTypeCollection::getMediaType(const ::rtl::OUString& _sURL) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/rtftok/data/fdo49501.rtf  |5 
 sw/qa/extras/rtftok/rtftok.cxx |   26 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   27 -
 3 files changed, 44 insertions(+), 14 deletions(-)

New commits:
commit d6acd86fe1d2924a378e3053f83d47084a8bb108
Author: Miklos Vajna 
Date:   Wed May 9 11:30:13 2012 +0200

fdo#49501 RTF_MARGL/R/T/B should also set the current margin

Change-Id: I I69b92d0cd07c9f08f14affb447b55b26b2556186

diff --git a/sw/qa/extras/rtftok/data/fdo49501.rtf 
b/sw/qa/extras/rtftok/data/fdo49501.rtf
new file mode 100644
index 000..47bd691
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo49501.rtf
@@ -0,0 +1,5 @@
+{\rtf
+\landscape \paperw15309 \paperh11907 \margl567 \margr567 \margt567 \margb567 
+Department
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 605a20d..e6de843 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -95,6 +95,7 @@ public:
 void testFdo47764();
 void testFdo38786();
 void testN757651();
+void testFdo49501();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -127,6 +128,7 @@ public:
 CPPUNIT_TEST(testFdo47764);
 CPPUNIT_TEST(testFdo38786);
 CPPUNIT_TEST(testN757651);
+CPPUNIT_TEST(testFdo49501);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -701,6 +703,30 @@ void Test::testN757651()
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+void Test::testFdo49501()
+{
+load("fdo49501.rtf");
+
+uno::Reference 
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xStyles(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xPageStyles(xStyles->getByName("PageStyles"), uno::UNO_QUERY);
+uno::Reference 
xStyle(xPageStyles->getByName("Default"), uno::UNO_QUERY);
+
+sal_Bool bIsLandscape = sal_False;
+xStyle->getPropertyValue("IsLandscape") >>= bIsLandscape;
+CPPUNIT_ASSERT_EQUAL(sal_True, bIsLandscape);
+sal_Int32 nExpected(TWIP_TO_MM100(567));
+sal_Int32 nValue = 0;
+xStyle->getPropertyValue("LeftMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
+xStyle->getPropertyValue("RightMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
+xStyle->getPropertyValue("TopMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
+xStyle->getPropertyValue("BottomMargin") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b2f6c88..957174e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2620,34 +2620,30 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgSz, 
NS_ooxml::LN_CT_PageSz_w, pIntValue, true);
 break;
-case RTF_MARGL:
+case RTF_MARGL: // fall through: set the default + current value
 lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_left, pIntValue, true);
-break;
-case RTF_MARGR:
-lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
-NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_right, pIntValue, true);
-break;
-case RTF_MARGT:
-lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
-NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_top, pIntValue, true);
-break;
-case RTF_MARGB:
-lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
-NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_bottom, pIntValue, true);
-break;
 case RTF_MARGLSXN:
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_left, pIntValue, true);
 break;
+case RTF_MARGR: // fall through: set the default + current value
+lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
+NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_right, pIntValue, true);
 case RTF_MARGRSXN:
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
 NS_ooxml::LN_EG_SectPrContents_pgMar, 
NS_ooxml::LN_CT_PageMar_right, pIntValue, true);
 break;
+case RTF_MARGT: // fall through: set the default + current value
+lcl_putNestedAttribute(m_aDefaultState.aSectionSprms,
+NS_ooxml::LN_EG_SectPrContents_

Re: [GSoC2012] Introduction / Impress smartphone remote control

Hi there,

On Tue, 2012-05-08 at 21:19 +0100, Andrzej J. R. Hunt wrote:
> just a few small (code) organisational issues -- I'm not entirely sure 
> where it's best to place the code: there are going to be 3 components:
> - The common code (thrift definition)
> - The server component
> - The android app
> 
> I thought it might be most appropriate to create a new folder in the 
> main libo directory e.g. "impressremote", which will contain the thrift 
> definitions and android app (with space to add more apps for other 
> smartphones).

Sounds reasonable to me :-)

>   The server component I think is best kept in sd/source/ui/remotecontrol 
> for the gui part, the actual server code could be there or in 
> sd/source/core/remotecontrol.

Having the server code in sd/source/ui/ doesn't sound horribly
out-of-place with common practise; the UNO interfaces all tend to be in
ui/ directories.

> Since thrift isn't available as a standard package on most distros (and 
> windows) would it be appropriate to add downloading and building of 
> thrift to the makefiles ? Or should I change the choice of RPC to use 
> something with simpler dependencies (thrift seems to be most suitable 
> from what I've been able to determine, although XML- or JSON-RPC 
> wouldn't really be a problem in terms of efficiency, what is more of an 
> issue is making these work bidirectionally -- another alternative is 
> scrapping RPC and implementing a custom messaging protocol, but this 
> would be less flexible for the case that someone wants to extend things 
> in the future -- in gmote they have a custom packet implemented as a 
> class for every command, with this object being serialised and then 
> sent, and deserialised at the other end -- although this wouldn't work 
> in our case since the server is in C++, and the client in an arbitrary 
> language).

Up to you really :-) of course, adding more dependencies - particularly
if we only have a five method interface seems like quite a chunk of
work; many distros would have to package thrift, and add dependencies to
it - we'd have to make it compile cleanly on windows and mac, and then
there is the size.

Either way, assuming the core library is less than say 100k or so
stripped, and all the above can be solved, I'm fairly sure no-one will
object.

Then again - getting something working as a first pass, perhaps
linux-only with thrify, and iteratively improving / slimming
dependencies / growing the feature-set is usually the best strategy :-)
trying to make the perfect choice from the get-go is often rather hard.

Anyhow - encouraged by your research :-)

ATB,

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

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

Re: [PUSHED] make, use mixed paths on cygwin, remove ugly paths conversion

2012-05-09 Thread Noel Power


On 06/05/12 19:57, Matúš Kukan wrote:

Hello,

These patches allow us to get rid of path conversions in makefiles by
using cygpath -m format.
But this only works with make 3.82, so configure is also changed.
(Only for cygwin)
There are only few exceptions where we need cygpath -u format.

I am not sure if we want this now or later. (after libreoffice-3-6
branch is created ?)
Posting here, so you know about this and can push if that's good.

It should work without problems ;-)

HTH,
Matúš

pushed ( although I couldn't test it ) it seems like a good idea ( the 
usual window experts can of course object and revert if necessary ) and 
it seems to work for others who have tested it



Noel

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

[PUSHED][3-5] Re: [REVIEW:3-5] fdo#47764 fix RTF import of automatic paragraph background color

On 09/05/12 10:41, Miklos Vajna wrote:
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=e8706d7
> 
> Regression from 3.4; backported patch attached.
> 
> (v1.9.1 of the spec on page 23 states this detail that 0 means
> "automatic" color, which is the Writer default.)

makes sense, pushed to libreoffice-3-5

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

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

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 34d7dc5145013900ac0f7f31f92beb01c858461a
Author: Miklos Vajna 
Date:   Wed May 2 17:50:55 2012 +0200

fdo#47764 fix RTF import of automatic paragraph background color

Change-Id: I4b3a4bd6ce45cffc5b2c23052c49ff98579c5564

Signed-off-by: Michael Stahl 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d65b642..f36e763 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2373,6 +2373,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 }
 break;
 case RTF_CBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, 
NS_sprm::LN_PShd, NS_ooxml::LN_CT_Shd_fill, pValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-5] Revert "Set the listbox height to an integer multiple of the listbox entry height"


On 09.05.2012 12:22, Jean-Baptiste Faure wrote:

Is this fix eligible for backport to 3.5 ?


Hopefully. :) We need a sign-off from someone courageous enough...

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

Re: [PATCH] make, use mixed paths on cygwin, remove ugly paths conversion

2012-05-09 Thread Andras Timar

2012/5/9 Michael Stahl :
> On 09/05/12 10:02, d.ostrov...@idaia.de wrote:
>> Hi,
>>
>> +1 for this.
>> This simplify enormously the whole build.
>
> +1 from me as well: i cannot really believe how many man-hours were
> spent so far on trying to get this Cygwin path conversion nonsense to
> actually work, and apparently it still doesn't, so getting rid of it
> sounds like the way to go.
>
>> The only question is, can we require, that all Windows build machines
>> have make 3.82 installed?
>
> that is a good question :)
> certainly the tinderboxes must be updated before this goes in.

AFAIK everybody uses 3.82 on Windows (special edition from
contrib/dev-tools/tree/make-3.82-gbuild). With stock 3.81 the build
breaks (sometimes I do make instead of /opt/lo/bin/make by mistake and
I always fail!). 3.82 from Cygwin is also buggy, Fridrich had problems
with it, if I remember correctly. So don't worry about this
requirement.

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

Re: [PATCH] make, use mixed paths on cygwin, remove ugly paths conversion

On 09/05/12 10:02, d.ostrov...@idaia.de wrote:
> Hi,
> 
> +1 for this.
> This simplify enormously the whole build.

+1 from me as well: i cannot really believe how many man-hours were
spent so far on trying to get this Cygwin path conversion nonsense to
actually work, and apparently it still doesn't, so getting rid of it
sounds like the way to go.

> The only question is, can we require, that all Windows build machines  
> have make 3.82 installed?

that is a good question :)
certainly the tinderboxes must be updated before this goes in.

> Ciao
> David
> 
> Zitat von Noel Grandin :
> 
>> Hi
>>
>> Any chance we can get this in so I can get my tinderbox running on a  
>> RAM-Drive?
>> I can confirm it works on my tinderbox at least.
>>
>> Regards, Noel Grandin.
>>
>> On 2012-05-06 20:57, Matú? Kukan wrote:
>>> Hello,
>>>
>>> These patches allow us to get rid of path conversions in makefiles by
>>> using cygpath -m format.
>>> But this only works with make 3.82, so configure is also changed.
>>> (Only for cygwin)
>>> There are only few exceptions where we need cygpath -u format.
>>>
>>> I am not sure if we want this now or later. (after libreoffice-3-6
>>> branch is created ?)
>>> Posting here, so you know about this and can push if that's good.
>>>
>>> It should work without problems ;-)
>>>
>>> HTH,
>>> Matú?
>>>
>>>
>>> ___
>>> LibreOffice mailing list
>>> LibreOffice@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>> Disclaimer: http://www.peralex.com/disclaimer.html
>>
>>
>>
> 


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

Re: [PATCH] Revert "Set the listbox height to an integer multiple of the listbox entry height"

2012-05-09 Thread Jean-Baptiste Faure

Le 08/05/2012 16:32, Cor Nouws a écrit :
> Ivan Timofeev wrote (07-05-12 20:55)
>
>> Actually that creates some problems:
>> 1. Some listboxes get too small so that it's impossible to use the
>> scrollbar.[1]
>
>> [...]
>> [1] https://bugs.freedesktop.org/attachment.cgi?id=60955
>
> Ah, maybe the source too of the too tiny listbox in Impress slide
> transitions, for which I have a bugreport pending ...
> Will check next daily build.
>
Probably. This revert fixed same problems in Navigator ans Stylist.

Is this fix eligible for backport to 3.5 ?

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

Events Calendar on LibreOffice.org website and wiki

2012-05-09 Thread Marc Paré

FYI, there is now an "events calendar" on the LibreOffice website. You 
will find it in the "About Us" section[1]. For those of you working on 
the wiki, you may also find same calendar on the wiki with identical 
information[2].


Feel free to let Florian Effenberger or myself know of any missing 
events. We hope to have a couple more people from the marketing team 
volunteer to admin the calendar.


Cheers,

Marc


[1] 
http://www.libreoffice.org/about-us/libreoffice-international-events-calendar/

[2] https://wiki.documentfoundation.org/EventsCalendar

--
Marc Paré
m...@marcpare.com
http://www.parEntreprise.com
parEntreprise.com Supports OpenDocument Formats (ODF)
parEntreprise.com Supports http://www.LibreOffice.org

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

[PATCH] confusion with overlapping grammar errors

2012-05-09 Thread Daniel Naber

Hi,

I was asked to post my patch from
https://bugs.freedesktop.org/show_bug.cgi?id=49605 here:

Problem: having two grammar errors that partly overlap confuses writer, it 
will show the same error message for both. I think that's because only the 
first error is considered, as the error's end position is ignored. The 
attached patch seems to fix this.

See the issue for a description of how to reproduce this. Feedback is 
welcome.

Regards
 Daniel

-- 
http://www.danielnaber.de
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 34fc195..53d9e3d 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1162,7 +1162,7 @@ bool SwEditShell::GetGrammarCorrection(
 // return suggestions for first error that includes the given error position
 const linguistic2::SingleProofreadingError &rError = rResult.aErrors[i];
 if (rError.nErrorStart <= rErrorPosInText &&
-rErrorPosInText < rError.nErrorStart + rError.nErrorLength)
+rErrorPosInText + nLen <= rError.nErrorStart + rError.nErrorLength)
 {
 rSuggestions = rError.aSuggestions;
 rErrorIndexInResult = i;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: swext/Extension_wiki-publisher.mk

2012-05-09 Thread Stephan Bergmann

 swext/Extension_wiki-publisher.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 29b7738085c4fb272b845900ef908f621d02cd68
Author: Stephan Bergmann 
Date:   Wed May 9 11:16:33 2012 +0200

fdo#46509: xsltml .xsl files missing from wiki-publisher.oxt

A regression introduced by e7a1e17c4fdea4103e7f921e8cd9c315c1dbe612 "convert
swext to gbuild and add to tail_build."

Change-Id: I29efe28ad6353d725afe9cce6f470c5492aa87a8

diff --git a/swext/Extension_wiki-publisher.mk 
b/swext/Extension_wiki-publisher.mk
index 1b6eb51..f142446 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -53,6 +53,13 @@ $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKI
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(OUTDIR)/bin/xslt/export/xsltml/cmarkup.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(OUTDIR)/bin/xslt/export/xsltml/entities.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(OUTDIR)/bin/xslt/export/xsltml/glayout.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(OUTDIR)/bin/xslt/export/xsltml/mmltex.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(OUTDIR)/bin/xslt/export/xsltml/scripts.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tables.xsl))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tokens.xsl))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-05-09 Thread Tor Lillqvist

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eeccd69e49f9c237f3966a69f678894c9e5d4750
Author: Tor Lillqvist 
Date:   Wed May 9 12:07:07 2012 +0300

Add usp10 here, too

Change-Id: Ice9bf5cbd894950ef3db5fb32778c83bc4ab5baa

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index f425d36..a0cf531 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -244,6 +244,7 @@ gb_Library_PLAINLIBS_NONE += \
shlwapi \
urlmon \
user32 \
+   usp10 \
uuid \
winmm \
version \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License Statement

2012-05-09 Thread Brad Sowden


Hi,

All of my past & future contributions to LibreOffice may be licensed 
under the MPL/LGPLv3+ dual license.


Cheers,
Brad Sowden
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-5] fdo#39106: properly draw separators in vertical toolbars


Hi,

attached a simplified fix for
https://bugs.freedesktop.org/show_bug.cgi?id=39106

(just see https://bugs.freedesktop.org/attachment.cgi?id=48958)

In the gtk native theming only vertical separators were supported. The 
patch falls back to non-native rendering in the case of vertical 
toolbars (i.e. horizontal separators). (In master both vertical and 
horizontal separators are drawn natively now).


Thanks,
Ivan


0001-fdo-39106-properly-draw-separators-in-vertical-toolb.patch
Description: application/mbox
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW:3-5] fdo#47764 fix RTF import of automatic paragraph background color

Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e8706d7

Regression from 3.4; backported patch attached.

(v1.9.1 of the spec on page 23 states this detail that 0 means
"automatic" color, which is the Writer default.)

Thanks,

Miklos
>From fe203cb75f2529b4bb15a49c8f0b22eba9e55bda Mon Sep 17 00:00:00 2001
From: Miklos Vajna 
Date: Wed, 2 May 2012 17:50:55 +0200
Subject: [PATCH] fdo#47764 fix RTF import of automatic paragraph background
 color

Change-Id: I4b3a4bd6ce45cffc5b2c23052c49ff98579c5564
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d65b642..f36e763 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2373,6 +2373,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 }
 break;
 case RTF_CBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_sprm::LN_PShd, NS_ooxml::LN_CT_Shd_fill, pValue);
-- 
1.7.7

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

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