[Libreoffice-commits] .: sc/source
sc/source/ui/inc/tabview.hxx |9 +
sc/source/ui/view/tabview.cxx |9 +
sc/source/ui/view/tabview3.cxx | 199 +++--
sc/source/ui/view/tabview5.cxx |2
4 files changed, 163 insertions(+), 56 deletions(-)
New commits:
commit c43a4cb4ffc80c49b8e51ae0796321a6b73b5e99
Author: Kohei Yoshida
Date: Thu Jan 5 22:13:52 2012 -0500
fdo#36851, bnc#737190: Make the data validation popup more reliable.
Previously, the data validation message popup was not sticking on
reliably on Linux, and flickers very bad on Windows. That was due to
the painting conflict between the top-most frame window and the grid
window. By making the message popup window a child window of the
grid window, it paints more reliably.
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index c356379..09244bb 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -36,6 +36,9 @@
#include "viewutil.hxx"
#include "select.hxx"
+#include
+#include
+
class ScEditEngineDefaulter;
class ScGridWindow;
class ScOutlineWindow;
@@ -89,7 +92,7 @@ public:
// ---
-class ScTabView
+class ScTabView : boost::noncopyable
{
private:
enum BlockMode { None = 0, Normal = 1, Own = 2 };
@@ -129,7 +132,7 @@ private:
ScCornerButton aTopButton;
ScrollBarBoxaScrollBarBox;
-ScHintWindow* pInputHintWindow; // Eingabemeldung bei
Gueltigkeit
+boost::scoped_ptr mpInputHintWindow; // popup window for
data validation
ScPageBreakData*pPageBreakData; // fuer Seitenumbruch-Modus
std::vector maHighlightRanges;
@@ -243,7 +246,7 @@ public:
voidHideListBox();
-boolHasHintWindow() const { return pInputHintWindow != NULL;
}
+boolHasHintWindow() const;
voidRemoveHintWindow();
voidTestHintWindow();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index bba84cd..6d1652f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -142,6 +142,7 @@
#include "AccessibilityHints.hxx"
#include "appoptio.hxx"
#include "attrib.hxx"
+#include "hintwin.hxx"
#include
@@ -307,7 +308,7 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh,
ScTabViewShell* pView
aCornerButton( pFrameWin, &aViewData, false ),
aTopButton( pFrameWin, &aViewData, sal_True ),
aScrollBarBox( pFrameWin, WB_SIZEABLE ),
-pInputHintWindow( NULL ),
+mpInputHintWindow( NULL ),
pPageBreakData( NULL ),
pBrushDocument( NULL ),
pDrawBrushSet( NULL ),
@@ -390,7 +391,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size&
rSize, bool bInner )
{
HideListBox();
-bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
@@ -1300,7 +1301,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
{
-sal_Bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
@@ -1389,7 +1390,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos
eWhich, bool bUpdBars )
void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
{
-sal_Bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 556d3bf..a8fd507 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -359,7 +359,6 @@ void ScTabView::CellContentChanged()
rBindings.Invalidate( SID_HYPERLINK_GETLINK );
InvalidateAttribs();// Attribut-Updates
-TestHintWindow(); // Eingabemeldung (Gueltigkeit)
aViewData.GetViewShell()->UpdateInputHandler();
}
@@ -470,6 +469,135 @@ void ScTabView::CursorPosChanged()
aViewData.SetTabStartCol( SC_TABSTART_NONE );
}
+namespace {
+
+Point calcHintWindowPosition(
+const Point& rCellPos, const Size& rCellSize, const Size& rFrameWndSize,
const Size& rHintWndSize)
+{
+const long nMargin = 20;
+
+long nMLeft = rCellPos.X();
+long nMRight = rFrameWndSize.Width() - rCellPos.X() - rCellSize.Width();
+long nMTop = rCellPos.Y();
+long nMBottom = rFrameWndSize.Height() - rCellPos.Y() - rCellSize.Height();
+
+// First, see if we can fit the entire hint window in the visible region.
+
+if (nMRight - nMargin >= rHintWndSize.Width())
+{
+// Right margin is wide enough.
+if (rFrameWndSize.Height() >= rHintWndSize.Height())
+{
+// The frame has enough height. Take it.
+Point aPos = rCellPos;
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/inc/tabview.hxx |9 +
sc/source/ui/view/tabview.cxx |9 +
sc/source/ui/view/tabview3.cxx | 199 +++--
sc/source/ui/view/tabview5.cxx |2
4 files changed, 163 insertions(+), 56 deletions(-)
New commits:
commit a6dc4b7a1e2fcbe478bc7feae06bc9ff24b26aaf
Author: Kohei Yoshida
Date: Thu Jan 5 22:13:52 2012 -0500
fdo#36851, bnc#737190: Make the data validation popup more reliable.
Previously, the data validation message popup was not sticking on
reliably on Linux, and flickers very bad on Windows. That was due to
the painting conflict between the top-most frame window and the grid
window. By making the message popup window a child window of the
grid window, it paints more reliably.
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index c356379..09244bb 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -36,6 +36,9 @@
#include "viewutil.hxx"
#include "select.hxx"
+#include
+#include
+
class ScEditEngineDefaulter;
class ScGridWindow;
class ScOutlineWindow;
@@ -89,7 +92,7 @@ public:
// ---
-class ScTabView
+class ScTabView : boost::noncopyable
{
private:
enum BlockMode { None = 0, Normal = 1, Own = 2 };
@@ -129,7 +132,7 @@ private:
ScCornerButton aTopButton;
ScrollBarBoxaScrollBarBox;
-ScHintWindow* pInputHintWindow; // Eingabemeldung bei
Gueltigkeit
+boost::scoped_ptr mpInputHintWindow; // popup window for
data validation
ScPageBreakData*pPageBreakData; // fuer Seitenumbruch-Modus
std::vector maHighlightRanges;
@@ -243,7 +246,7 @@ public:
voidHideListBox();
-boolHasHintWindow() const { return pInputHintWindow != NULL;
}
+boolHasHintWindow() const;
voidRemoveHintWindow();
voidTestHintWindow();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index bba84cd..6d1652f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -142,6 +142,7 @@
#include "AccessibilityHints.hxx"
#include "appoptio.hxx"
#include "attrib.hxx"
+#include "hintwin.hxx"
#include
@@ -307,7 +308,7 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh,
ScTabViewShell* pView
aCornerButton( pFrameWin, &aViewData, false ),
aTopButton( pFrameWin, &aViewData, sal_True ),
aScrollBarBox( pFrameWin, WB_SIZEABLE ),
-pInputHintWindow( NULL ),
+mpInputHintWindow( NULL ),
pPageBreakData( NULL ),
pBrushDocument( NULL ),
pDrawBrushSet( NULL ),
@@ -390,7 +391,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size&
rSize, bool bInner )
{
HideListBox();
-bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
@@ -1300,7 +1301,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
{
-sal_Bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
@@ -1389,7 +1390,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos
eWhich, bool bUpdBars )
void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
{
-sal_Bool bHasHint = ( pInputHintWindow != NULL );
+bool bHasHint = HasHintWindow();
if (bHasHint)
RemoveHintWindow();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 556d3bf..a8fd507 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -359,7 +359,6 @@ void ScTabView::CellContentChanged()
rBindings.Invalidate( SID_HYPERLINK_GETLINK );
InvalidateAttribs();// Attribut-Updates
-TestHintWindow(); // Eingabemeldung (Gueltigkeit)
aViewData.GetViewShell()->UpdateInputHandler();
}
@@ -470,6 +469,135 @@ void ScTabView::CursorPosChanged()
aViewData.SetTabStartCol( SC_TABSTART_NONE );
}
+namespace {
+
+Point calcHintWindowPosition(
+const Point& rCellPos, const Size& rCellSize, const Size& rFrameWndSize,
const Size& rHintWndSize)
+{
+const long nMargin = 20;
+
+long nMLeft = rCellPos.X();
+long nMRight = rFrameWndSize.Width() - rCellPos.X() - rCellSize.Width();
+long nMTop = rCellPos.Y();
+long nMBottom = rFrameWndSize.Height() - rCellPos.Y() - rCellSize.Height();
+
+// First, see if we can fit the entire hint window in the visible region.
+
+if (nMRight - nMargin >= rHintWndSize.Width())
+{
+// Right margin is wide enough.
+if (rFrameWndSize.Height() >= rHintWndSize.Height())
+{
+// The frame has enough height. Take it.
+Point aPos = rCellPos;
+
[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_databaserangeobj.mk sc/inc sc/qa sc/source
sc/CppunitTest_sc_databaserangeobj.mk | 144 +++ sc/inc/tokenarray.hxx |2 sc/qa/extras/xdatabaserange.cxx | 175 ++ sc/source/core/data/cell.cxx |1 sc/source/core/tool/token.cxx | 13 +- 5 files changed, 330 insertions(+), 5 deletions(-) New commits: commit 6069ef7976c4455c1875afecf02c41c5731f6546 Author: Markus Mohrhard Date: Fri Jan 6 03:15:38 2012 +0100 add inital part for XDatabaseRange test, related fdo#44167 diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk new file mode 100644 index 000..187f13a --- /dev/null +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -0,0 +1,144 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Markus Mohrhard +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sc_databaserangeobj)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \ +sc/qa/extras/xdatabaserange \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,sc_databaserangeobj, \ +avmedia \ +basegfx \ +comphelper \ +cppu \ +cppuhelper \ +drawinglayer \ +editeng \ +fileacc \ +for \ +forui \ +i18nisolang1 \ +msfilter \ +oox \ +sal \ +salhelper \ +sax \ +sb \ +sc \ +sfx \ +sot \ +svl \ +svt \ +svx \ +svxcore \ + test \ +tl \ +tk \ +ucbhelper \ + unotest \ +utl \ +vbahelper \ +vcl \ +xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\ +-I$(realpath $(SRCDIR)/sc/source/ui/inc) \ +-I$(realpath $(SRCDIR)/sc/inc) \ +$$(INCLUDE) \ +-I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_CppunitTest_add_api,sc_databaserangeobj,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj)) + +$(eval $(call gb_CppunitTest_add_type_rdbs,sc_databaserangeobj,\ +types \ +)) + +$(eval $(call gb_CppunitTest_add_components,sc_databaserangeobj,\ +basic/util/sb \ +comphelper/util/comphelp \ +configmgr/source/configmgr \ +dbaccess/util/dba \ +fileaccess/source/fileacc \ +filter/source/config/cache/filterconfig1 \ +forms/util/frm \ +framework/util/fwk \ +i18npool/util/i18npool \ +oox/util/oox \ +package/source/xstor/xstor \ +package/util/package2 \ +sax/source/expatwrap/expwrap \ +sax/source/fastparser/fastsax \ +sc/util/sc \ +sc/util/scd \ +sc/util/scfilt \ +sc/util/vbaobj \ +scripting/source/basprov/basprov \ +scripting/util/scriptframe \ +sfx2/util/sfx \ +sot/util/sot \ +svl/source/fsstor/fsstorage \ +toolkit/util/tk \ +unotools/util/utl \ +unoxml/source/rdf/unordf \ +unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sc_databaserangeobj,\ +ucb1 \ +ucpfile1 \ +ucptdoc1 \ +)) + +$(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\ +--headless \ +--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ +"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ +)) +# .../spool is required for the (somewhat strange) filter configuration + +# we need to +# a) explicitly depend on library msword because it is not implied by a link +#relation +# b) explicitly depend on the sc resource files needed at unit-test runtime +$(call gb_CppunitTest_get_target,sc_databa
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 38 +--
writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx|2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 11
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2
5 files changed, 38 insertions(+), 18 deletions(-)
New commits:
commit 4b6f8b09e6823dfb237a4b9ea5c2abc21ccf030a
Author: Miklos Vajna
Date: Fri Jan 6 00:36:18 2012 +0100
fdo#44053 fix RTF import of implicit horizontal table cell merges
(cherry picked from commit 01292f171cc851ba092510f10a97cd293670829e)
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 3bfb463..31d46bd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, bool
bImplicitMerges) :
m_nRow(0),
m_nCell(0),
m_nGridSpan(1),
@@ -56,6 +56,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
+m_bImplicitMerges(bImplicitMerges),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -437,12 +438,12 @@ void DomainMapperTableManager::endOfRowAction()
for( ; aGridSpanIter != pCurrentSpans->end(); ++aGridSpanIter)
nGrids += *aGridSpanIter;
+//determine table width
+double nFullWidth = m_nTableWidth;
+//the positions have to be distibuted in a range of 1
+const double nFullWidthRelative = 1.;
if( pTableGrid->size() == nGrids )
{
-//determine table width
-double nFullWidth = m_nTableWidth;
-//the positions have to be distibuted in a range of 1
-const double nFullWidthRelative = 1.;
uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell - 1 );
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nLastRelPos = 0;
@@ -476,6 +477,33 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
+else if (m_bImplicitMerges)
+{
+// More grid than cells definitions? Then take the last ones.
+// This feature is used by the RTF implicit horizontal cell merges.
+uno::Sequence< text::TableColumnSeparator > aSeparators(m_nCell - 1);
+text::TableColumnSeparator* pSeparators = aSeparators.getArray();
+
+sal_Int16 nSum = 0;
+sal_uInt32 nPos = 0;
+// Ignoring the i=0 case means we assume that the width of the last
cell matches the table width
+for (int i = m_nCell; i > 1; i--)
+{
+nSum += (*pTableGrid.get())[pTableGrid->size() - i]; // Size of
the current cell
+pSeparators[nPos].Position = nSum * nFullWidthRelative /
nFullWidth; // Relative position
+pSeparators[nPos].IsVisible = sal_True;
+nPos++;
+}
+
+TablePropertyMapPtr pPropMap( new TablePropertyMap );
+pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny(
aSeparators ) );
+#ifdef DEBUG_DOMAINMAPPER
+dmapper_logger->startElement("rowProperties");
+pPropMap->dumpXml( dmapper_logger );
+dmapper_logger->endElement();
+#endif
+insertRowProps(pPropMap);
+}
++m_nRow;
m_nCell = 0;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6b20f02..67aeb74 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -50,6 +50,7 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1
then the repeating stops
sal_Int32 m_nTableWidth; //might be set directly or has to be
calculated from the column positions
boolm_bOOXML;
+boolm_bImplicitMerges;
::rtl::OUString m_sTableStyleName;
PropertyMapPtr m_pTableStyleTextProperies;
@@ -63,7 +64,7 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
public:
-DomainMapperTableManager(bool bOOXML);
+DomainMapperTableManager(bool bOOXML, bool bImplicitMerges);
virtual ~DomainMapperTableManager();
// use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d7d0546..c4899cb 100644
--- a/writerfilter/source/dmapp
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 38 +--
writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx|2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 11
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2
5 files changed, 38 insertions(+), 18 deletions(-)
New commits:
commit 01292f171cc851ba092510f10a97cd293670829e
Author: Miklos Vajna
Date: Fri Jan 6 00:36:18 2012 +0100
fdo#44053 fix RTF import of implicit horizontal table cell merges
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index bca93f9..a430fc2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, bool
bImplicitMerges) :
m_nRow(0),
m_nCell(0),
m_nGridSpan(1),
@@ -56,6 +56,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
+m_bImplicitMerges(bImplicitMerges),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -437,12 +438,12 @@ void DomainMapperTableManager::endOfRowAction()
for( ; aGridSpanIter != pCurrentSpans->end(); ++aGridSpanIter)
nGrids += *aGridSpanIter;
+//determine table width
+double nFullWidth = m_nTableWidth;
+//the positions have to be distibuted in a range of 1
+const double nFullWidthRelative = 1.;
if( pTableGrid->size() == nGrids )
{
-//determine table width
-double nFullWidth = m_nTableWidth;
-//the positions have to be distibuted in a range of 1
-const double nFullWidthRelative = 1.;
uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell - 1 );
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nLastRelPos = 0;
@@ -476,6 +477,33 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
+else if (m_bImplicitMerges)
+{
+// More grid than cells definitions? Then take the last ones.
+// This feature is used by the RTF implicit horizontal cell merges.
+uno::Sequence< text::TableColumnSeparator > aSeparators(m_nCell - 1);
+text::TableColumnSeparator* pSeparators = aSeparators.getArray();
+
+sal_Int16 nSum = 0;
+sal_uInt32 nPos = 0;
+// Ignoring the i=0 case means we assume that the width of the last
cell matches the table width
+for (int i = m_nCell; i > 1; i--)
+{
+nSum += (*pTableGrid.get())[pTableGrid->size() - i]; // Size of
the current cell
+pSeparators[nPos].Position = nSum * nFullWidthRelative /
nFullWidth; // Relative position
+pSeparators[nPos].IsVisible = sal_True;
+nPos++;
+}
+
+TablePropertyMapPtr pPropMap( new TablePropertyMap );
+pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny(
aSeparators ) );
+#ifdef DEBUG_DOMAINMAPPER
+dmapper_logger->startElement("rowProperties");
+pPropMap->dumpXml( dmapper_logger );
+dmapper_logger->endElement();
+#endif
+insertRowProps(pPropMap);
+}
++m_nRow;
m_nCell = 0;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6b20f02..67aeb74 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -50,6 +50,7 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1
then the repeating stops
sal_Int32 m_nTableWidth; //might be set directly or has to be
calculated from the column positions
boolm_bOOXML;
+boolm_bImplicitMerges;
::rtl::OUString m_sTableStyleName;
PropertyMapPtr m_pTableStyleTextProperies;
@@ -63,7 +64,7 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
public:
-DomainMapperTableManager(bool bOOXML);
+DomainMapperTableManager(bool bOOXML, bool bImplicitMerges);
virtual ~DomainMapperTableManager();
// use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d7d0546..c4899cb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.h
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/aqua
vcl/aqua/source/app/salinst.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 287db243f944a54e3b368c96b3fa62e168056d3e
Author: Thorsten Behrens
Date: Fri Jan 6 00:34:10 2012 +0100
Fix fdo#33816 - don't loop infinitely when using Apple Remote
Removed erratic loop condition - we simply want to check if any
frame has fullscreen flag set.
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0898e67..0926c6f 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -626,9 +626,9 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
bool bIsFullScreenMode = false;
std::list::iterator it = pSalData->maFrames.begin();
-while( (*it) && ( (it != pSalData->maFrames.end() ) || (
(*it)->mbFullScreen == false ) ) )
+while( it != pSalData->maFrames.end() )
{
-if ( ((*it)->mbFullScreen == true) )
+if ( (*it) && ((*it)->mbFullScreen == true) )
bIsFullScreenMode = true;
++it;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/app/salinst.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2f1c17087cad93f7692c33ed5364f5ad7f16ebfb
Author: Thorsten Behrens
Date: Fri Jan 6 00:34:10 2012 +0100
Fix fdo#33816 - don't loop infinitely when using Apple Remote
Removed erratic loop condition - we simply want to check if any
frame has fullscreen flag set.
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 3df6844..dbff33c 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -626,9 +626,9 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
bool bIsFullScreenMode = false;
std::list::iterator it = pSalData->maFrames.begin();
-while( (*it) && ( (it != pSalData->maFrames.end() ) || (
(*it)->mbFullScreen == false ) ) )
+while( it != pSalData->maFrames.end() )
{
-if ( ((*it)->mbFullScreen == true) )
+if ( (*it) && ((*it)->mbFullScreen == true) )
bIsFullScreenMode = true;
++it;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 522e9184ba5c6e1453c29504454cf7e39ce8bb95
Author: Caolán McNamara
Date: Thu Jan 5 14:17:44 2012 +
drop a String::CreateFromAscii
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
index ee68bd1..bc304d7 100644
--- a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx
@@ -316,7 +316,7 @@ JPEGReader::JPEGReader( SvStream& rStm, void*
/*pCallData*/, sal_Bool bSetLS ) :
nLastLines ( 0 ),
bSetLogSize ( bSetLS )
{
-maUpperName = String::CreateFromAscii( "SVIJPEG", 7 );
+maUpperName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SVIJPEG"));
nFormerPos = nLastPos;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svl/source
svl/source/memtools/svarray.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6fd08caf5f15fba48ea4600ab57acd34f9600017
Author: Christina Rossmanith
Date: Tue Nov 8 20:29:24 2011 +0100
Translated German comments
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index ee37bdf..e49af56 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -60,7 +60,7 @@ SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
// strings -
-// Array mit anderer Seek-Methode!
+// Array with different Seek method
_SV_IMPL_SORTAR_ALG( SvStringsISort, StringPtr )
void SvStringsISort::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
{
@@ -107,7 +107,7 @@ sal_Bool SvStringsISort::Seek_Entry( const StringPtr aE,
sal_uInt16* pP ) const
// strings -
-// Array mit anderer Seek-Methode!
+// Array with different Seek method
_SV_IMPL_SORTAR_ALG( SvStringsISortDtor, StringPtr )
void SvStringsISortDtor::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - editeng/source svl/source
editeng/source/editeng/impedit3.cxx |7 --- svl/source/memtools/svarray.cxx |1 - 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 764040ac4e931e3460d0bd78906a7e624c994223 Author: Christina Rossmanith Date: Tue Nov 8 15:09:12 2011 +0100 removed unused #define_SVSTDARR_sal_uI(n)t16S(SORT) diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index 5d92043..ee37bdf 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -35,7 +35,6 @@ #define _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSISORT #define _SVSTDARR_STRINGSISORTDTOR -#define _SVSTDARR_sal_uInt16SSORT #define _SVSTDARR_BYTESTRINGS #define _SVSTDARR_BYTESTRINGSDTOR commit 62d86ff5501a924528b9b2794b18af16b3ddcbf0 Author: Christina Rossmanith Date: Tue Nov 8 08:42:27 2011 +0100 Remove Fill() usage diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9c2a800..c964aeb 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -77,6 +77,8 @@ #include #include +#include +#include using ::rtl::OUString; using namespace ::com::sun::star; @@ -3289,12 +3291,11 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta aTmpFont.SetEscapement( 0 ); aTmpFont.SetPropr( 100 ); aTmpFont.SetPhysFont( pOutDev ); -String aBlanks; -aBlanks.Fill( nTextLen, ' ' ); +rtl::OUStringBuffer aBlanks = comphelper::string::padToLength( aBlanks, (sal_Int32) nTextLen, ' ' ); Point aUnderlinePos( aOutPos ); if ( nOrientation ) aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos ); -pOutDev->DrawStretchText( aUnderlinePos, aSz.Width(), aBlanks, 0, nTextLen ); +pOutDev->DrawStretchText( aUnderlinePos, aSz.Width(), aBlanks.makeStringAndClear(), 0, nTextLen ); aTmpFont.SetUnderline( UNDERLINE_NONE ); if ( !nOrientation ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/runtime/methods.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25e84ee95954a28d9a6a1b346e6673a9a6de71cc
Author: August Sodora
Date: Thu Jan 5 14:45:10 2012 -0500
fdo#44172: Basic function VAL produces bad result
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b98c586..34a453a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -128,7 +128,7 @@ static void FilterWhiteSpace( String& rStr )
if (!rStr.Len())
return;
-rtl::OUStringBuffer aRet(rStr);
+rtl::OUStringBuffer aRet;
for (xub_StrLen i = 0; i < rStr.Len(); ++i)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source
svtools/inc/svtools/filedlg.hxx | 30 -
svtools/source/dialogs/filedlg.cxx | 21 -
svtools/source/dialogs/filedlg2.cxx | 594
svtools/source/dialogs/filedlg2.hxx | 71
4 files changed, 11 insertions(+), 705 deletions(-)
New commits:
commit 7482e974117df2bdc737785efdf9eb410787c7b4
Author: Michael Stahl
Date: Thu Jan 5 18:37:42 2012 +0100
svtools: remove unused FileDialog
svtools/filedlg.hxx(88) : warning C4610: class ´FileDialog´ can never be
instantiated
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index d25219a..b771631 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -26,8 +26,8 @@
*
/
-#ifndef _SVT_FILEDLG_HXX
-#define _SVT_FILEDLG_HXX
+#ifndef SVT_FILEDLG_HXX
+#define SVT_FILEDLG_HXX
#include "svtools/svtdllapi.h"
@@ -43,10 +43,8 @@ class ImpSvFileDlg;
class SVT_DLLPUBLIC PathDialog : public ModalDialog
{
private:
-friend class FileDialog;// Imp...
-
ImpSvFileDlg* pImpFileDlg;// Implementation
-LinkaOKHdlLink; // Link zum OK-Handler
+LinkaOKHdlLink; // Link to OK-Handler
protected:
UniString aDfltExt; // Default - Extension
@@ -67,26 +65,6 @@ public:
virtual short Execute();
};
-// --
-// - SvFileDialog -
-// --
-
-class SVT_DLLPUBLIC FileDialog : public PathDialog
-{
-private:
-LinkaFileHdlLink; // Link zum FileSelect-Handler
-LinkaFilterHdlLink; // Link zum FilterSelect-Handler
-
-public:
-~FileDialog();
-
-virtual voidFileSelect();
-virtual voidFilterSelect();
-
-const UniString&GetDefaultExt() const { return aDfltExt; }
-UniString GetFilterType( sal_uInt16 nPos ) const;
-};
-
-#endif // _FILEDLG_HXX
+#endif // FILEDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg.cxx
b/svtools/source/dialogs/filedlg.cxx
index 77a071c..c2224ae 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -34,7 +34,7 @@ PathDialog::PathDialog( Window* _pParent, WinBits nStyle,
sal_Bool bCreateDir )
ModalDialog( _pParent, WB_STDMODAL | nStyle )
{
pImpFileDlg = new ImpSvFileDlg;
-pImpFileDlg->CreateDialog( this, nStyle, WINDOW_PATHDIALOG, bCreateDir );
+pImpFileDlg->CreatePathDialog(this, bCreateDir);
}
PathDialog::~PathDialog()
@@ -72,23 +72,4 @@ long PathDialog::OK()
return sal_True;
}
-FileDialog::~FileDialog()
-{
-}
-
-void FileDialog::FileSelect()
-{
-aFileHdlLink.Call( this );
-}
-
-void FileDialog::FilterSelect()
-{
-aFilterHdlLink.Call( this );
-}
-
-UniString FileDialog::GetFilterType( sal_uInt16 nPos ) const
-{
- return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterType( nPos );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/filedlg2.cxx
b/svtools/source/dialogs/filedlg2.cxx
index 319848f..32f6ef6 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -692,600 +692,10 @@ UniString ImpPathDialog::GetPath() const
return aFile.GetFull();
}
-
-ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits,
RESOURCE_TYPE nType ) :
- ImpPathDialog( pDlg, nType, sal_False )
-{
-bOpen = (nWinBits & WB_SAVEAS) == 0;
-
-SvtResId aSvtResId = bOpen ? STR_FILEDLG_OPEN : STR_FILEDLG_SAVE;
-
-// Titel setzen
-GetFileDialog()->SetText( UniString( aSvtResId ) );
-nDirCount = 0;
-
-// initialize Controls if not used as a base class
-if ( nType == WINDOW_FILEDIALOG )
-InitControls();
-
-pDlg->SetHelpId( HID_FILEDLG_OPENDLG );
-
-}
-
-ImpFileDialog::~ImpFileDialog()
-{
-for ( size_t i = 0, n = aFilterList.size(); i < n; ++i ) {
-delete aFilterList[ i ];
-}
-aFilterList.clear();
-
-delete pFileTitel;
-if (pFileList && ( pFileList != pDirList ) )
-delete pFileList;
-
-delete pTypeTitel;
-delete pTypeList;
-}
-
-void ImpFileDialog::InitControls()
-{
-UniString aEmptyStr;
-
-const int nW = 160;
-const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen
-
-INITCONTROL( pFileTitel, FixedText, 0,
-Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE )
), HID_FILEDLG_FILE );
-INITCONTROL( pEdit, Edit, WB_BORDER,
-Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask()
-INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER,
-Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES );
-
-INITCONTROL( pDirTitel, FixedText, 0,
-Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR )
), HID_FILEDLG_DIR );
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/rangenam.hxx|1
sc/inc/reftokenhelper.hxx |1
sc/source/core/tool/rangenam.cxx |9 +
sc/source/core/tool/reftokenhelper.cxx | 54 -
sc/source/core/tool/token.cxx | 10 +-
sc/source/ui/inc/namemgrtable.hxx |4 +-
sc/source/ui/namedlg/namedlg.cxx |2 -
sc/source/ui/namedlg/namemgrtable.cxx |7 ++--
sc/source/ui/namedlg/namepast.cxx |5 ++-
9 files changed, 25 insertions(+), 68 deletions(-)
New commits:
commit 5b8deb57c6782b77fcf180ef6097f71b6e1b07d2
Author: Markus Mohrhard
Date: Thu Jan 5 18:35:05 2012 +0100
simplify code a bit
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index c076f34..9119e3e 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -58,7 +58,6 @@ public:
const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar);
static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken,
bool bExternal = false);
-static bool getAbsRangeFromToken(ScRange& rRange, const ScTokenRef&
pToken, const ScAddress& rPos, bool bExternal = false);
static void getRangeListFromTokens(ScRangeList& rRangeList, const
::std::vector& pTokens);
diff --git a/sc/source/core/tool/reftokenhelper.cxx
b/sc/source/core/tool/reftokenhelper.cxx
index 364556c..2a32e12 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -146,25 +146,6 @@ void singleRefToAddr(const ScSingleRefData& rRef,
ScAddress& rAddr)
rAddr.SetTab(rRef.nTab);
}
-//returns an absolute address in reference to rPos
-void singleRefToAbsAddr(const ScSingleRefData& rRef, ScAddress& rAddr, const
ScAddress& rPos)
-{
-if (rRef.IsColRel())
-rAddr.SetCol(rRef.nRelCol + rPos.Col());
-else
-rAddr.SetCol(rRef.nCol);
-
-if (rRef.IsRowRel())
-rAddr.SetRow(rRef.nRelRow + rPos.Row());
-else
-rAddr.SetRow(rRef.nRow);
-
-if (rRef.IsTabRel())
-rAddr.SetTab(rRef.nRelTab + rPos.Tab());
-else
-rAddr.SetTab(rRef.nTab);
-}
-
}
bool ScRefTokenHelper::getRangeFromToken(ScRange& rRange, const ScTokenRef&
pToken, bool bExternal)
@@ -202,41 +183,6 @@ bool ScRefTokenHelper::getRangeFromToken(ScRange& rRange,
const ScTokenRef& pTok
return false;
}
-bool ScRefTokenHelper::getAbsRangeFromToken(ScRange& rRange, const ScTokenRef&
pToken, const ScAddress& rPos, bool bExternal)
-{
-StackVar eType = pToken->GetType();
-switch (pToken->GetType())
-{
-case svSingleRef:
-case svExternalSingleRef:
-{
-if ((eType == svExternalSingleRef && !bExternal) ||
-(eType == svSingleRef && bExternal))
-return false;
-
-const ScSingleRefData& rRefData = pToken->GetSingleRef();
-singleRefToAbsAddr(rRefData, rRange.aStart, rPos);
-rRange.aEnd = rRange.aStart;
-return true;
-}
-case svDoubleRef:
-case svExternalDoubleRef:
-{
-if ((eType == svExternalDoubleRef && !bExternal) ||
-(eType == svDoubleRef && bExternal))
-return false;
-
-const ScComplexRefData& rRefData = pToken->GetDoubleRef();
-singleRefToAbsAddr(rRefData.Ref1, rRange.aStart, rPos);
-singleRefToAbsAddr(rRefData.Ref2, rRange.aEnd, rPos);
-return true;
-}
-default:
-; // do nothing
-}
-return false;
-}
-
void ScRefTokenHelper::getRangeListFromTokens(ScRangeList& rRangeList, const
vector& rTokens)
{
vector::const_iterator itr = rTokens.begin(), itrEnd =
rTokens.end();
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8196b8a..83be799 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1823,7 +1823,6 @@ namespace {
void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument*
pNewDoc, const SCTAB nTab, rtl::OUString& rTabName, sal_uInt16& rFileId)
{
rtl::OUString aFileName = pOldDoc->GetFileURL();;
-std::cout << aFileName << std::endl;
rFileId = pNewDoc->GetExternalRefManager()->getExternalFileId(aFileName);
rTabName = pOldDoc->GetCopyTabName(nTab);
if (rTabName.isEmpty())
@@ -1839,7 +1838,9 @@ bool IsInCopyRange( const ScRange& rRange, const
ScDocument* pClipDoc )
bool SkipReference(ScToken* pToken, const ScAddress& rPos, const ScDocument*
pOldDoc, bool bRangeName)
{
ScRange aRange;
-if (!ScRefTokenHelper::getAbsRangeFromToken(aRange, pToken, rPos))
+
+pToken->CalcAbsIfRel(rPos);
+if (!ScRefTokenHelper::getRangeFromToken(aRange, pToken))
return true;
if (bRangeName && aRange.aStart.Tab() == rPos.Tab())
commit ac7f046d27b4e47361f44efe252fca867a0a1d02
Author: Markus Mohrhard
Date: Thu Jan 5 18:28:05 2012 +0100
remove unneeded debug statements
dif
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/edit/eddel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 71f9c3a5c108161661d047beb7d63352622a0474
Author: Cédric Bosdonnat
Date: Thu Jan 5 17:53:10 2012 +0100
fdo#40250: safer protection check... why using the layout for this?
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 85d27e4..67deb43 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -89,7 +89,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
}
// geschuetze Boxen ueberspringen !
if( !pNd->IsCntntNode() ||
-!((SwCntntNode*)pNd)->getLayoutFrm( GetLayout()
)->IsProtected() )
+!pNd->IsInProtectSect() )
{
// alles loeschen
GetDoc()->DeleteAndJoin( aDelPam );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/edit/eddel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f8c361927f9ae05887c1a8f337a9df88abb19474
Author: Cédric Bosdonnat
Date: Thu Jan 5 17:53:10 2012 +0100
fdo#40250: safer protection check... why using the layout for this?
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 85d27e4..67deb43 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -89,7 +89,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
}
// geschuetze Boxen ueberspringen !
if( !pNd->IsCntntNode() ||
-!((SwCntntNode*)pNd)->getLayoutFrm( GetLayout()
)->IsProtected() )
+!pNd->IsInProtectSect() )
{
// alles loeschen
GetDoc()->DeleteAndJoin( aDelPam );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/qa
sal/qa/osl/mutex/osl_Mutex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8f823b7d39154d2044e08174a858f8ef357a151a
Author: Matúš Kukan
Date: Thu Jan 5 17:32:21 2012 +0100
gcc-trunk: fix: unable to find string literal operator 'operator FOO'
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 10a95c1..f4f34d6 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -754,7 +754,7 @@ namespace osl_ClearableGuard
TimeValue aTimeVal_after;
osl_getSystemTime( &aTimeVal_after );
sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
-printf("nSec is %"SAL_PRIdINT32"\n", nSec);
+printf("nSec is %" SAL_PRIdINT32 "\n", nSec);
myThread.join();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Extension.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3082565d6291176ef1fcdc053f9851c82a02d19a Author: Matúš Kukan Date: Thu Jan 5 17:09:21 2012 +0100 propmerge is not executable diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3069408..76fdccf 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -36,7 +36,7 @@ endif gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex) gb_Extension_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET) -gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge) +gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge gb_Extension_PROPMERGECOMMAND := \ $(PERL) $(gb_Extension_PROPMERGETARGET) gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/crsr/crsrsh.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b7d6bff10a85986e5e6ebfa961f29fa8b3815b40
Author: Cédric Bosdonnat
Date: Thu Jan 5 16:59:22 2012 +0100
Header/Footer: fix some bad indicators updates due to wrong call order
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 049a867..36fe86d 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1315,22 +1315,22 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags,
sal_Bool bIdleEnd )
return; // wenn nicht, dann kein Update !!
}
-if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
-ToggleHeaderFooterEdit();
sal_Bool bInHeader= sal_True;
if ( IsInHeaderFooter( &bInHeader ) )
{
-if ( IsShowHeaderFooterSeparator( Header ) && !bInHeader )
+if ( !bInHeader )
{
SetShowHeaderFooterSeparator( Footer, true );
SetShowHeaderFooterSeparator( Header, false );
}
-else if ( IsShowHeaderFooterSeparator( Footer ) && bInHeader )
+else
{
SetShowHeaderFooterSeparator( Header, true );
SetShowHeaderFooterSeparator( Footer, false );
}
}
+if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
+ToggleHeaderFooterEdit();
// #i27301#
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - android/qa configure.in fontconfig/fontconfig-2.8.0.patch freetype/freetype-2.4.8.patch vcl/Library_vcl.mk vcl/null
android/qa/sc/Makefile|1 +
configure.in | 16
fontconfig/fontconfig-2.8.0.patch |9 +
freetype/freetype-2.4.8.patch |9 +
vcl/Library_vcl.mk|8
vcl/null/printerinfomanager.cxx | 19 +++
6 files changed, 58 insertions(+), 4 deletions(-)
New commits:
commit c5b502664156db0b252c26054eb1047aec469175
Author: Tor Lillqvist
Date: Thu Jan 5 17:51:09 2012 +0200
Add some more stuff to the Android libvcl
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f18c18f..4b153f0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -437,9 +437,17 @@ $(eval $(call gb_Library_add_defs,vcl,\
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
+vcl/generic/fontmanager/fontcache \
+vcl/generic/fontmanager/fontconfig \
+vcl/generic/fontmanager/fontmanager \
vcl/unx/generic/plugadapt/salplug \
+vcl/unx/generic/printer/ppdparser \
vcl/null/printerinfomanager \
))
+$(eval $(call gb_Library_use_externals,vcl,\
+ fontconfig \
+ freetype \
+))
endif
ifeq ($(GUIBASE),cocoatouch)
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 964a19d..934f277 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -39,6 +39,14 @@ using ::rtl::OString;
using ::rtl::OStringToOUString;
using ::rtl::OUStringHash;
+PrinterInfoManager& PrinterInfoManager::get()
+{
+SalData* pSalData = GetSalData();
+if( ! pSalData->m_pPIManager )
+pSalData->m_pPIManager = new PrinterInfoManager();
+return *pSalData->m_pPIManager;
+}
+
void PrinterInfoManager::release()
{
SalData* pSalData = GetSalData();
@@ -46,4 +54,15 @@ void PrinterInfoManager::release()
pSalData->m_pPIManager = NULL;
}
+PrinterInfoManager::PrinterInfoManager( Type eType ) :
+m_pQueueInfo( NULL ),
+m_eType( eType ),
+m_bUseIncludeFeature( false ),
+m_bUseJobPatch( true ),
+m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ),
+m_bDisableCUPS( false )
+{
+initSystemDefaultPaper();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 01d7c6a24b7a8244a3ae5816e39d3358242a35ea
Author: Tor Lillqvist
Date: Thu Jan 5 17:36:21 2012 +0200
Set FONTCONFIG_LIBS and FREETYPE_LIBS for the internal case (for Android)
diff --git a/configure.in b/configure.in
index b7b255a..2683a32 100644
--- a/configure.in
+++ b/configure.in
@@ -3115,13 +3115,15 @@ if test "$test_cups" = "yes"; then
fi
-# check for fontconfig support
-AC_MSG_CHECKING([whether we need fontconfig])
+# fontconfig checks
if test "z$test_fontconfig" = "zyes"; then
-AC_MSG_RESULT([yes])
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
else
-AC_MSG_RESULT([no])
+case "$BUILD_TYPE" in
+*FONTCONFIG*)
+FONTCONFIG_LIBS="-lfontconfig"
+;;
+esac
fi
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
@@ -5451,6 +5453,12 @@ dnl
===
if test "$test_freetype" = "yes"; then
AC_MSG_CHECKING([whether freetype is available])
PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
+else
+case "$BUILD_TYPE" in
+*FREETYPE*)
+FREETYPE_LIBS="-lfreetype"
+;;
+esac
fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
commit c8bab278bb2ee9b27b5e8181100cb23dcf5a975c
Author: Tor Lillqvist
Date: Thu Jan 5 13:08:42 2012 +0200
Don't use soname, Android doesn't support that
diff --git a/fontconfig/fontconfig-2.8.0.patch
b/fontconfig/fontconfig-2.8.0.patch
index 5b5cdce..2185d2e 100644
--- a/fontconfig/fontconfig-2.8.0.patch
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -20,6 +20,15 @@
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/build/fontconfig-2.8.0/configure
+++ misc/build/fontconfig-2.8.0/configure
+@@ -8718,7 +8718,7 @@
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags -o $lib'
+
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -14073,7 +14073,7 @@
no)
;;
diff --git a/freetype/freetype-2.4.8.patch b/freetype/freetype-2.4.8.patch
index 0318919..9ae69a3 100644
--- a/freetype/freetype-2.4.8.patch
+++ b/freetype/freetype-2.4.8.patch
@@ -9,3 +9,12 @@
else
case "$host" in
*-dec-osf*)
+@@ -10039,7 +10039,7 @@
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+- archive_cmds='$CC '
[Libreoffice-commits] .: 2 commits - svl/source svtools/source svtools/workben svx/source svx/workben
svl/source/config/itemholder2.cxx |4
svl/source/fsstor/fsstorage.cxx |2
svtools/source/config/itemholder2.cxx |4
svtools/source/dialogs/addresstemplate.cxx|6 -
svtools/source/misc/chartprettypainter.cxx|3
svtools/workben/svdem.cxx |2
svtools/workben/treecontrol/treetest.cxx |4
svx/source/accessibility/AccessibleShape.cxx |6 -
svx/source/accessibility/DescriptionGenerator.cxx | 10 +-
svx/source/fmcomp/gridctrl.cxx|3
svx/source/svdraw/svdoashp.cxx|2
svx/source/svdraw/svdoole2.cxx| 24 +
svx/source/table/tablecontroller.cxx | 15 +--
svx/source/table/tablelayouter.cxx| 100 --
svx/source/table/tablelayouter.hxx| 11 --
svx/source/unodraw/unopage.cxx| 48 --
svx/source/unodraw/unoshcol.cxx |2
svx/workben/msview/xmlconfig.cxx |4
18 files changed, 38 insertions(+), 212 deletions(-)
New commits:
commit fd189805e3e42f11bc8ad726c8e4f170337e8267
Author: Takeshi Abe
Date: Fri Jan 6 00:21:36 2012 +0900
removed dead code
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 06c6d42..18e8332 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1076,40 +1076,6 @@ void TableLayouter::UpdateBorderLayout()
}
//
-
-/*
-void TableLayouter::SetLayoutToModel()
-{
-const sal_Int32 nRowCount = getRowCount();
-const sal_Int32 nColCount = getColumnCount();
-
-try
-{
-sal_Int32 nOldSize = 0;
-
-Reference< XIndexAccess > xRows( mxTable->getRows(), UNO_QUERY_THROW );
-for( sal_Int32 nRow = 0; nRow < nRowCount; nRow++ )
-{
-Reference< XPropertySet > xRowSet( xRows->getByIndex( nRow ),
UNO_QUERY_THROW );
-xRowSet->getPropertyValue( msSize ) >>= nOldSize;
-if( maRows[nRow].mnSize != nOldSize )
-xRowSet->setPropertyValue( msSize, Any( maRows[nRow].mnSize )
);
-}
-
-for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
-{
-Reference< XPropertySet > xColSet( getColumnByIndex( nCol ),
UNO_QUERY_THROW );
-xColSet->getPropertyValue( msSize ) >>= nOldSize;
-if( maColumns[nCol].mnSize != nOldSize )
-xColSet->setPropertyValue( msSize, Any( maColumns[nCol].mnSize
) );
-}
-}
-catch( Exception& )
-{
-OSL_FAIL("sdr::table::TableLayouter::SetLayoutToModel(), exception
caught!");
-}
-}
-*/
-//
-
void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32
nFirstCol, sal_Int32 nLastCol )
{
@@ -1228,72 +1194,6 @@ sal_Int32 TableLayouter::getRowStart( sal_Int32 nRow )
const
//
-
-/*
-sal_Int32 TableLayouter::detectInsertedOrRemovedRows()
-{
-sal_Int32 nHeightChange = 0;
-
-try
-{
-Reference< XIndexAccess > xRows( mxTable->getRows(), UNO_QUERY_THROW );
-std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > >::iterator oldIter( mxRows.begin() );
-sal_Int32 nCount = xRows->getCount();
-for( sal_Int32 nRow = 0; nRow < nCount; nRow++ )
-{
-Reference< XInterface > xRow( xRows->getByIndex(nRow), UNO_QUERY );
-
-std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > >::iterator searchIter = mxRows.end();
-if( oldIter != mxRows.end() )
-searchIter = std::find( oldIter,mxRows.end(), xRow );
-
-if( searchIter == mxRows.end() )
-{
-// new row
-Reference< XPropertySet > xSet( xRow, UNO_QUERY_THROW );
-sal_Int32 nSize = 0;
-xSet->getPropertyValue( msSize ) >>= nSize;
-nHeightChange += nSize;
-}
-else if( searchIter == oldIter )
-{
-// no change
-oldIter++;
-}
-else
-{
-// rows removed
-do
-{
-Reference< XPropertySet > xSet( (*oldIter),
UNO_QUERY_THROW );
-sal_Int32 nSize = 0;
-xSet->getPropertyValue( msSize ) >>= nSize;
-nHeightChange -= nSize;
-}
-while( oldIter++ != searchIter );
-}
-}
-
-while( oldIter != mxRows.end() )
-{
-// rows removed
-Reference< XPropertySet > xSet( (
[Libreoffice-commits] .: 2 commits - binfilter/bf_xmloff binfilter/inc
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx |1 + binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx |1 + binfilter/inc/bf_starmath/smmod.hxx |2 ++ binfilter/inc/bf_sw/shellres.hxx|2 +- 4 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 87ca1791f234745ef6e1a06c61929bca470bc03d Author: Marcel Metz Date: Tue Jan 3 15:18:41 2012 +0100 Added missing includes. diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx index 6f7b2aa..b4d2d13 100644 --- a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx +++ b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx index 1505eea..c67a9ec 100644 --- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx +++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx @@ -34,6 +34,7 @@ #include +#include #include #include commit c18c1fab778db040e5c5b9657e826eb90345ff00 Author: Marcel Metz Date: Tue Jan 3 15:18:35 2012 +0100 Added missing includes. diff --git a/binfilter/inc/bf_starmath/smmod.hxx b/binfilter/inc/bf_starmath/smmod.hxx index f3f4ec4..1ec73db 100644 --- a/binfilter/inc/bf_starmath/smmod.hxx +++ b/binfilter/inc/bf_starmath/smmod.hxx @@ -29,6 +29,8 @@ #ifndef _SMMOD_HXX #define _SMMOD_HXX +#include +#include #include #include #include diff --git a/binfilter/inc/bf_sw/shellres.hxx b/binfilter/inc/bf_sw/shellres.hxx index 847d749..9f6c979 100644 --- a/binfilter/inc/bf_sw/shellres.hxx +++ b/binfilter/inc/bf_sw/shellres.hxx @@ -31,7 +31,7 @@ #include - +#include #include #ifndef _SVSTDARR_HXX ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - svx/inc svx/source sw/inc sw/source
svx/inc/svx/xmleohlp.hxx|5 ++
svx/source/xml/xmleohlp.cxx | 78 +++-
svx/source/xml/xmlgrhlp.cxx | 21 ++---
sw/inc/cmdid.h |6 +-
sw/source/core/doc/docnew.cxx | 17 ---
sw/source/core/unocore/unoframe.cxx |4 -
6 files changed, 68 insertions(+), 63 deletions(-)
New commits:
commit 3e146690d527d1c736685640e9f11172c7d087ba
Author: Caolán McNamara
Date: Wed Jan 4 16:45:34 2012 +
Resolves: fdo#43867 collection of problems causing loss of ole2 previews
a) factor out part of SvXMLEmbeddedObjectHelper::ImplGetStorageNames as
splitObjectURL to reuse in SvXMLGraphicHelper::ImplGetStreamNames to get
better
url splitting logic to handle "./ObjectReplacements/foo"
b) FN_UNO_REPLACEMENT_GRAPHIC_URL and FN_UNO_GRAPHIC ids collide
urls incorrectly treated as graphics
c) imported preview images for objects set on a temporary
svt::EmbeddedObjectRef *copy* of the object, not the real object.
(cherry picked from commit ef17be8b006737c078a59635ae334a03301727ea)
Signed-off-by: Michael Stahl
Conflicts:
svx/source/xml/xmlgrhlp.cxx
diff --git a/svx/inc/svx/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx
index 88d9651..247038b 100644
--- a/svx/inc/svx/xmleohlp.hxx
+++ b/svx/inc/svx/xmleohlp.hxx
@@ -145,6 +145,11 @@ public:
// XNameAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements( ) throw
(::com::sun::star::uno::RuntimeException);
+
+
+static void splitObjectURL(::rtl::OUString aURLNoPar,
+::rtl::OUString& rContainerStorageName,
+::rtl::OUString& rObjectStorageName);
};
#endif
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 83bf464..f20158c 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -206,6 +206,48 @@ void SAL_CALL SvXMLEmbeddedObjectHelper::disposing()
Flush();
}
+
+void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar,
+::rtl::OUString& rContainerStorageName,
+::rtl::OUString& rObjectStorageName)
+{
+DBG_ASSERT( '#' != aURLNoPar[0], "invalid object URL" );
+
+sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' );
+if( -1 == _nPos )
+{
+rContainerStorageName = ::rtl::OUString();
+rObjectStorageName = aURLNoPar;
+}
+else
+{
+//eliminate 'superfluous' slashes at start and end
+//#i103076# load objects with all allowed xlink:href syntaxes
+{
+//eliminate './' at start
+sal_Int32 nStart = 0;
+sal_Int32 nCount = aURLNoPar.getLength();
+if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
+{
+nStart = 2;
+nCount -= 2;
+}
+
+//eliminate '/' at end
+sal_Int32 nEnd = aURLNoPar.lastIndexOf( '/' );
+if( nEnd == aURLNoPar.getLength()-1 && nEnd != (nStart-1) )
+nCount--;
+
+aURLNoPar = aURLNoPar.copy( nStart, nCount );
+}
+
+_nPos = aURLNoPar.lastIndexOf( '/' );
+if( _nPos >= 0 )
+rContainerStorageName = aURLNoPar.copy( 0, _nPos );
+rObjectStorageName = aURLNoPar.copy( _nPos+1 );
+}
+}
+
//
-
sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
@@ -308,41 +350,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
}
else
{
-DBG_ASSERT( '#' != aURLNoPar[0], "invalid object URL" );
-
-sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' );
-if( -1 == _nPos )
-{
-rContainerStorageName = ::rtl::OUString();
-rObjectStorageName = aURLNoPar;
-}
-else
-{
-//eliminate 'superfluous' slashes at start and end
-//#i103076# load objects with all allowed xlink:href syntaxes
-{
-//eliminate './' at start
-sal_Int32 nStart = 0;
-sal_Int32 nCount = aURLNoPar.getLength();
-if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
-{
-nStart = 2;
-nCount -= 2;
-}
-
-//eliminate '/' at end
-sal_Int32 nEnd = aURLNoPar.lastIndexOf( '/' );
-if( nEnd == aURLNoPar.getLength()-1 && nEnd != (nStart-1) )
-nCount--;
-
-aURLNoPar = aURLNoPar.copy( nStart, nCount );
-}
-
-_nPos = aURLNoPar.lastIndexOf( '/' );
-if( _nPos >= 0 )
-rContainerStorageName = aURLNoPar.copy( 0, _nPos );
-rObjectStorageName = aURLNoPar.copy( _nPos+1 );
-}
+splitObjectURL(aURLNoPar, rContaine
[Libreoffice-commits] .: jvmfwk/plugins jvmfwk/source l10ntools/source lingucomponent/source
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |8 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 30 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 18 +-
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |8 ++--
jvmfwk/source/elements.cxx |8 ++--
jvmfwk/source/framework.cxx |4 +-
jvmfwk/source/fwkbase.cxx| 28
l10ntools/source/directory.cxx |2 -
l10ntools/source/export.cxx | 32 +--
l10ntools/source/help/HelpCompiler.hxx |2 -
l10ntools/source/helpmerge.cxx |2 -
l10ntools/source/merge.cxx |2 -
lingucomponent/source/lingutil/lingutil.cxx |2 -
lingucomponent/source/spellcheck/spell/sspellimp.cxx |4 +-
lingucomponent/source/thesaurus/libnth/nthesimp.cxx |2 -
15 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit c47f3523338b8e58c1ea18cc583064761f60df90
Author: Gustavo Buzzatti Pacheco
Date: Wed Jan 4 11:38:41 2012 -0200
Fix for fdo43460 Part XXII getLength() to isEmpty()
Part XXII
modules
jvmfwk, l10ntools, lingucomponent
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 53ac693..628461c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -164,7 +164,7 @@ bool GnuInfo::initialize(vector >
props)
}
else if (!bAccess && sAccessProperty.equals(i->first))
{
-if (i->second.getLength() > 0)
+if (!i->second.isEmpty())
{
m_bAccessibility = true;
bAccess = true;
@@ -177,11 +177,11 @@ bool GnuInfo::initialize(vector
> props)
if (!bVersion || !bVendor || !bHome)
return false;
-if (!m_sJavaHome.getLength())
+if (m_sJavaHome.isEmpty())
m_sJavaHome =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"));
// init m_sRuntimeLibrary
-OSL_ASSERT(m_sHome.getLength());
+OSL_ASSERT(!m_sHome.isEmpty());
//call virtual function to get the possible paths to the runtime library.
int size = 0;
@@ -266,7 +266,7 @@ bool GnuInfo::initialize(vector >
props)
return false;
// init m_sLD_LIBRARY_PATH
-OSL_ASSERT(m_sHome.getLength());
+OSL_ASSERT(!m_sHome.isEmpty());
size = 0;
char const * const * arLDPaths = getLibraryPaths( & size);
vector ld_paths = getVectorFromCharArray(arLDPaths, size);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d70338f..08577c0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -116,7 +116,7 @@ OString getPluginJarPath(
//but this does not harm. 1.5.0-beta < 1.5.0
sName = sName2;
}
-if (sName.getLength())
+if (!sName.isEmpty())
{
sName = sLocation + OUSTR("/lib/") + sName;
OSL_VERIFY(
@@ -140,7 +140,7 @@ OString getPluginJarPath(
sPath = sPath1 + OUString::createFromAscii(sep) + sPath2;
}
}
-OSL_ASSERT(sPath.getLength());
+OSL_ASSERT(!sPath.isEmpty());
}
ret = rtl::OUStringToOString(sPath, osl_getThreadTextEncoding());
@@ -167,7 +167,7 @@ JavaInfo* createJavaInfo(const rtl::Reference &
info)
pInfo->nRequirements = info->needsRestart() ? JFW_REQUIRE_NEEDRESTART : 0;
rtl::OUStringBuffer buf(1024);
buf.append(info->getRuntimeLibrary());
-if (info->getLibraryPaths().getLength() > 0)
+if (!info->getLibraryPaths().isEmpty())
{
buf.appendAscii("\n");
buf.append(info->getLibraryPaths());
@@ -239,8 +239,8 @@ javaPluginError jfw_plugin_getAllJavaInfos(
OUString ouMinVer(sMinVersion);
OUString ouMaxVer(sMaxVersion);
-OSL_ASSERT(ouVendor.getLength() > 0);
-if (ouVendor.getLength() == 0)
+OSL_ASSERT(!ouVendor.isEmpty());
+if (ouVendor.isEmpty())
return JFW_PLUGIN_E_INVALID_ARG;
JavaInfo** arInfo = NULL;
@@ -258,7 +258,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
if (ouVendor.equals(cur->getVendor()) == sal_False)
continue;
-if (ouMinVer.getLength() > 0)
+if (!ouMinVer.isEmpty())
{
try
{
@@ -276,7 +276,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
}
}
-if (ouMaxVer.getLength() > 0)
+if (!ouMaxVer.isEmpty())
{
try
{
@@ -358,8 +358,8 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
if (!path || !sVendor || !sMinVersion || !sMaxVersion || !ppInfo)
return JFW_PLU
[Libreoffice-commits] .: dictionaries/fr_FR
dev/null |binary dictionaries/fr_FR/description.xml |2 +- dictionaries/fr_FR/icon.png|binary dictionaries/fr_FR/makefile.mk |2 +- 4 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ebf1e88855bf294968fe2475ecf82b21f7e90193 Author: Olivier R Date: Thu Jan 5 14:36:38 2012 +0100 New icon for French extension (language code) diff --git a/dictionaries/fr_FR/description.xml b/dictionaries/fr_FR/description.xml index ad2dd05..c375fc9 100644 --- a/dictionaries/fr_FR/description.xml +++ b/dictionaries/fr_FR/description.xml @@ -10,7 +10,7 @@ - + http://www.dicollecte.org/"; lang="fr">Dicollecte diff --git a/dictionaries/fr_FR/french_flag.png b/dictionaries/fr_FR/french_flag.png deleted file mode 100644 index ed12585..000 Binary files a/dictionaries/fr_FR/french_flag.png and /dev/null differ diff --git a/dictionaries/fr_FR/icon.png b/dictionaries/fr_FR/icon.png new file mode 100644 index 000..9e13bbd Binary files /dev/null and b/dictionaries/fr_FR/icon.png differ diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk index 368be74..51ac0b7 100644 --- a/dictionaries/fr_FR/makefile.mk +++ b/dictionaries/fr_FR/makefile.mk @@ -60,7 +60,7 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/hyph-fr.tex \ $(EXTENSIONDIR)$/hyph_fr.dic \ $(EXTENSIONDIR)$/thes_fr.dat \ -$(EXTENSIONDIR)$/french_flag.png \ +$(EXTENSIONDIR)$/icon.png \ $(EXTENSIONDIR)$/package-description.txt COMPONENT_CONFIGDEST=. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dictionaries/fr_FR
dev/null |binary dictionaries/fr_FR/description.xml |2 +- dictionaries/fr_FR/icon.png|binary dictionaries/fr_FR/makefile.mk |2 +- 4 files changed, 2 insertions(+), 2 deletions(-) New commits: commit e8972a8656c7eedc670dd357b6d06a303db3c2d6 Author: Olivier R Date: Thu Jan 5 14:36:38 2012 +0100 New icon for French extension (language code) diff --git a/dictionaries/fr_FR/description.xml b/dictionaries/fr_FR/description.xml index ad2dd05..c375fc9 100644 --- a/dictionaries/fr_FR/description.xml +++ b/dictionaries/fr_FR/description.xml @@ -10,7 +10,7 @@ - + http://www.dicollecte.org/"; lang="fr">Dicollecte diff --git a/dictionaries/fr_FR/french_flag.png b/dictionaries/fr_FR/french_flag.png deleted file mode 100644 index ed12585..000 Binary files a/dictionaries/fr_FR/french_flag.png and /dev/null differ diff --git a/dictionaries/fr_FR/icon.png b/dictionaries/fr_FR/icon.png new file mode 100644 index 000..9e13bbd Binary files /dev/null and b/dictionaries/fr_FR/icon.png differ diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk index 368be74..51ac0b7 100644 --- a/dictionaries/fr_FR/makefile.mk +++ b/dictionaries/fr_FR/makefile.mk @@ -60,7 +60,7 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/hyph-fr.tex \ $(EXTENSIONDIR)$/hyph_fr.dic \ $(EXTENSIONDIR)$/thes_fr.dat \ -$(EXTENSIONDIR)$/french_flag.png \ +$(EXTENSIONDIR)$/icon.png \ $(EXTENSIONDIR)$/package-description.txt COMPONENT_CONFIGDEST=. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 77d05dfa5ba3f81844b093808246d60504cfabda Author: Thorsten Behrens Date: Thu Jan 5 14:04:52 2012 +0100 Adapt doxygen gen script to changed Env file name. diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 5cc3d42..77e7562 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -20,10 +20,7 @@ shopt -s expand_aliases DOXYGEN_PROJECT_PREFIX="LibreOffice" # suck setup -BINDIR=`dirname $0` -. $BINDIR/setup - -. ./*.Set.sh +. ./Env.Host.sh # get list of modules in build order - bah, blows RAM & disk, static list below INPUT_PROJECTS="o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui chart2 dbaccess sd starmath sc sw" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - javaunohelper/com offapi/com
offapi/com/sun/star/chart2/InterpretedData.idl |2 +- offapi/com/sun/star/chart2/ScaleData.idl|2 +- offapi/com/sun/star/chart2/XAxis.idl|4 ++-- offapi/com/sun/star/chart2/XChartDocument.idl |2 +- offapi/com/sun/star/chart2/XChartTypeTemplate.idl |4 ++-- offapi/com/sun/star/chart2/XDataInterpreter.idl |4 ++-- offapi/com/sun/star/chart2/XDiagram.idl |2 +- offapi/com/sun/star/chart2/XInternalDataProvider.idl|2 +- offapi/com/sun/star/frame/DoubleInitializationException.idl |4 ++-- offapi/com/sun/star/frame/IllegalArgumentIOException.idl|4 ++-- offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl|8 offapi/com/sun/star/xml/sax/XSAXSerializable.idl|4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) New commits: commit 4732d156e701432ee056513aa75add6e9c0c4b4c Author: Tomas Hlavaty Date: Tue Dec 20 23:45:50 2011 +0100 chmod -x on java files diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java old mode 100755 new mode 100644 diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java old mode 100755 new mode 100644 commit 887b7f34fef7aae99e54aee049b38d2d0229ad00 Author: Tomas Hlavaty Date: Sat Dec 17 17:45:13 2011 +0100 idl fix package names diff --git a/offapi/com/sun/star/chart2/InterpretedData.idl b/offapi/com/sun/star/chart2/InterpretedData.idl index a64f853..250237a 100644 --- a/offapi/com/sun/star/chart2/InterpretedData.idl +++ b/offapi/com/sun/star/chart2/InterpretedData.idl @@ -51,7 +51,7 @@ struct InterpretedData /** */ -data::XLabeledDataSequence Categories; +com::sun::star::chart2::data::XLabeledDataSequence Categories; }; } ; // chart2 diff --git a/offapi/com/sun/star/chart2/ScaleData.idl b/offapi/com/sun/star/chart2/ScaleData.idl index 2c11810..0bb2f83 100644 --- a/offapi/com/sun/star/chart2/ScaleData.idl +++ b/offapi/com/sun/star/chart2/ScaleData.idl @@ -60,7 +60,7 @@ struct ScaleData XScalingScaling; -data::XLabeledDataSequence Categories; +com::sun::star::chart2::data::XLabeledDataSequence Categories; /** describes the type of the axis. diff --git a/offapi/com/sun/star/chart2/XChartDocument.idl b/offapi/com/sun/star/chart2/XChartDocument.idl index 7585747..26a2ab8 100644 --- a/offapi/com/sun/star/chart2/XChartDocument.idl +++ b/offapi/com/sun/star/chart2/XChartDocument.idl @@ -105,7 +105,7 @@ interface XChartDocument : ::com::sun::star::frame::XModel XDataReceiver::attachDataProvider has been called. */ -data::XDataProvider getDataProvider(); +com::sun::star::chart2::data::XDataProvider getDataProvider(); /** sets a new component that is able to create different chart type templates (components of type diff --git a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl index 348c93c..2be37ac 100644 --- a/offapi/com/sun/star/chart2/XChartTypeTemplate.idl +++ b/offapi/com/sun/star/chart2/XChartTypeTemplate.idl @@ -68,7 +68,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface ChartTypeTemplate. */ XDiagram createDiagramByDataSource( -[in] data::XDataSource xDataSource, +[in] com::sun::star::chart2::data::XDataSource xDataSource, [in] sequence< com::sun::star::beans::PropertyValue > aArguments ); /** @return @@ -121,7 +121,7 @@ interface XChartTypeTemplate : ::com::sun::star::uno::XInterface */ void changeDiagramData( [in] XDiagram xDiagram, -[in] data::XDataSource xDataSource, +[in] com::sun::star::chart2::data::XDataSource xDataSource, [in] sequence< com::sun::star::beans::PropertyValue > aArguments ); /** States whether the given diagram could have been created by diff --git a/offapi/com/sun/star/chart2/XDataInterpreter.idl b/offapi/com/sun/star/chart2/XDataInterpreter.idl index 547d9c3..f00d590 100644 --- a/offapi/com/sun/star/chart2/XDataInterpreter.idl +++ b/offapi/com/sun/star/chart2/XDataInterpreter.idl @@ -64,7 +64,7 @@ interface XDataInterpreter : ::com::sun::star::uno::XInterface creating new ones. */ InterpretedData interpretDataSource( -[in] data::XDataSource xSource, +[in] com::sun::star::chart2::data::XDataSource xSource, [in] sequence< com::sun::star::beans::PropertyValue > aArguments, [in] sequence< XDataSeries > aSeriesToReUse ); @@ -91,7 +91,7 @@ interface XDataInterpreter : ::com::sun::star::uno::XInterface interpretDataS
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc
solenv/inc/minor.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bbf5ee6d3bf825656e8b0246dc3baf85ce6b63e0 Author: Andras Timar Date: Thu Jan 5 13:34:32 2012 +0100 Bump year diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index ac419ee..81bc6be 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -8,4 +8,4 @@ VERSIONMAJOR=3 VERSIONMINOR=5 VERSIONMICRO=0 -COPYRIGHTYEARRANGE=2000-2011 +COPYRIGHTYEARRANGE=2000-2012 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/minor.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff76821030568038bde7fb72985238bc666c8352 Author: Andras Timar Date: Thu Jan 5 13:34:32 2012 +0100 Bump year diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index db639a4..f9c24e7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -8,4 +8,4 @@ VERSIONMAJOR=3 VERSIONMINOR=6 VERSIONMICRO=0 -COPYRIGHTYEARRANGE=2000-2011 +COPYRIGHTYEARRANGE=2000-2012 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/w32/security.c |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 8b898fb94ead6f698b2e2a0b551cf78c6bd62512
Author: Michael Stahl
Date: Thu Jan 5 13:18:25 2012 +0100
sal: try to fix MinGW min/max breakage by inlining
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 053d39f..2ae8685 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -368,12 +368,14 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security,
rtl_uString **strIdent)
DWORD dwSidRev=SID_REVISION;
DWORD dwCounter;
DWORD dwSidSize;
+PUCHAR pSSACount;
/* obtain SidIdentifierAuthority */
psia=GetSidIdentifierAuthority(pSid);
/* obtain sidsubauthority count */
-dwSubAuthorities=min(*GetSidSubAuthorityCount(pSid), 5);
+pSSACount = GetSidSubAuthorityCount(pSid);
+dwSubAuthorities = (*pSSACount < 5) ? *pSSACount : 5;
/* buffer length: S-SID_REVISION- + identifierauthority- +
subauthorities- + NULL */
Ident=malloc(88*sizeof(sal_Char));
@@ -424,7 +426,10 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security,
rtl_uString **strIdent)
sal_Unicode *Ident;
WNetGetUserA(NULL, NULL, &needed);
-needed = max( 16 , needed );
+if (needed < 16)
+{
+needed = 16;
+}
Ident=malloc(needed*sizeof(sal_Unicode));
if (WNetGetUserW(NULL, Ident, &needed) != NO_ERROR)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com udkapi/com
offapi/com/sun/star/drawing/DrawingDocumentFactory.idl |2 +-
offapi/com/sun/star/i18n/XExtendedTransliteration.idl |2 +-
offapi/com/sun/star/i18n/XNativeNumberSupplier.idl |2 +-
offapi/com/sun/star/linguistic2/LanguageGuessing.idl |2 +-
udkapi/com/sun/star/util/logging/Logger.idl|4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9e3235cd99f2b3210cdc8481b2b5a428119a1458
Author: Tomas Hlavaty
Date: Tue Dec 6 23:52:56 2011 +0100
minor idl fixes
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index e3464d4..db534ff 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -27,7 +27,7 @@
**
**/
#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
-#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
+#define __com_sun_star_drawing_DrawingDocumentFactory_idl__
#include
diff --git a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
index 88ac6a2..7e39848 100644
--- a/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
+++ b/offapi/com/sun/star/i18n/XExtendedTransliteration.idl
@@ -30,7 +30,7 @@
#define __com_sun_star_i18n_XExtendedTransliteration_idl__
#include
-#include
+#include
//=
diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
index 2b7d2ca..9b254a5 100644
--- a/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
+++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier.idl
@@ -30,7 +30,7 @@
#define __com_sun_star_i18n_XNativeNumberSupplier_idl__
#include
-#include
+#include
//=
diff --git a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
index cdb8384..ac56e6c 100644
--- a/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/LanguageGuessing.idl
@@ -29,7 +29,7 @@
#ifndef __com_sun_star_linguistic2_LanguageGuessing_idl__
#define __com_sun_star_linguistic2_LanguageGuessing_idl__
-#include
+#include
module com { module sun { module star { module linguistic2 {
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl
b/udkapi/com/sun/star/util/logging/Logger.idl
index 533b648..e2f7e6c 100644
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ b/udkapi/com/sun/star/util/logging/Logger.idl
@@ -30,8 +30,8 @@
#define __com_sun_star_webtop_Logger_idl__
#include
-#include
-#include
+#include
+#include
//=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/cellsuno.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a5e6ef23f8e0040b2e8543c838abea54072f2497
Author: Norbert Thiebaud
Date: Thu Jan 5 05:18:04 2012 -0600
use the docshell to change tab attributes. don't do it directly
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 6be0239..7e75ea8 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8509,8 +8509,11 @@ void ScTableSheetObj::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pEn
sal_Int32 nColor = COL_AUTO;
if (aValue >>= nColor)
{
-if (static_cast(nColor) != COL_AUTO)
-pDoc->SetTabBgColor(nTab,
Color(static_cast(nColor)));
+const Color aColor(static_cast(nColor));
+if (aColor != pDoc->GetTabBgColor(nTab))
+{
+aFunc.SetTabBgColor(nTab, aColor, true, true);
+}
}
}
else if ( pEntry->nWID == SC_WID_UNO_CODENAME )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - solenv/gbuild vcl/generic vcl/headless vcl/inc vcl/unx
solenv/gbuild/extensions/post_BuildplTargets.mk |4 +-
vcl/generic/print/common_gfx.cxx| 18 +-
vcl/generic/print/genprnpsp.cxx | 42
vcl/generic/print/printerjob.cxx|2 -
vcl/headless/svpprn.cxx |2 -
vcl/inc/vcl/ppdparser.hxx |3 +
vcl/unx/generic/printer/ppdparser.cxx |4 +-
7 files changed, 39 insertions(+), 36 deletions(-)
New commits:
commit f42e17d83b5c4f5343c8b113ef2d8dcbf96f8a20
Author: Christina Rossmanith
Date: Mon Jan 2 21:56:19 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 43c2cbb..26ac567 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -1188,26 +1188,26 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox,
void* pPtr, sal_uInt32 nSize
// first search the BoundingBox of the EPS data
SvMemoryStream aStream( pPtr, nSize, STREAM_READ );
aStream.Seek( STREAM_SEEK_TO_BEGIN );
-ByteString aLine;
+rtl::OString aLine;
rtl::OString aDocTitle;
double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0;
bool bEndComments = false;
while( ! aStream.IsEof()
&& ( ( fLeft == 0 && fRight == 0 && fTop == 0 && fBottom == 0 ) ||
-( aDocTitle.getLength() == 0 && bEndComments == false ) )
+( aDocTitle.isEmpty() && bEndComments == false ) )
)
{
aStream.ReadLine( aLine );
-if( aLine.Len() > 1 && aLine.GetChar( 0 ) == '%' )
+if( aLine.getLength() > 1 && aLine[0] == '%' )
{
-char cChar = aLine.GetChar(1);
+char cChar = aLine[1];
if( cChar == '%' )
{
-if( aLine.CompareIgnoreCaseToAscii( "%%BoundingBox:", 14 ) ==
COMPARE_EQUAL )
+if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM("%%BoundingBox:") ) )
{
aLine = WhitespaceToSpace(
comphelper::string::getToken(aLine, 1, ':') );
-if( aLine.Len() && aLine.Search( "atend" ) ==
STRING_NOTFOUND )
+if( !aLine.isEmpty() && aLine.indexOf( "atend" ) == -1 )
{
fLeft = StringToDouble( GetCommandLineToken( 0,
aLine ) );
fBottom = StringToDouble( GetCommandLineToken( 1,
aLine ) );
@@ -1215,9 +1215,9 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void*
pPtr, sal_uInt32 nSize
fTop= StringToDouble( GetCommandLineToken( 3,
aLine ) );
}
}
-else if( aLine.CompareIgnoreCaseToAscii( "%%Title:", 8 ) ==
COMPARE_EQUAL )
-aDocTitle = WhitespaceToSpace( aLine.Copy( 8 ) );
-else if( aLine.CompareIgnoreCaseToAscii( "%%EndComments", 13 )
== COMPARE_EQUAL )
+else if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM("%%Title:") ) )
+aDocTitle = WhitespaceToSpace( aLine.copy( 8 ) );
+else if( comphelper::string::matchIgnoreAsciiCaseL( aLine,
RTL_CONSTASCII_STRINGPARAM("%%EndComments") ) )
bEndComments = true;
}
else if( cChar == ' ' || cChar == '\t' || cChar == '\r' || cChar
== '\n' )
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 23a7bf5..747b0ec 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -47,6 +47,7 @@
#endif
#include "rtl/ustring.hxx"
+#include "comphelper/string.hxx"
#include "osl/module.h"
@@ -86,19 +87,19 @@ typedef int(*faxFunction)(String&);
static faxFunction pFaxNrFunction = NULL;
}
-static String getPdfDir( const PrinterInfo& rInfo )
+static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
{
-String aDir;
+rtl::OUString aDir;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
-OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
+rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
if( ! aToken.compareToAscii( "pdf=", 4 ) )
{
sal_Int32 nPos = 0;
aDir = aToken.getToken( 1, '=', nPos );
-if( ! aDir.Len() )
-aDir = String( ByteString( getenv( "HOME" ) ),
osl_getThreadTextEncoding() );
+if( aDir.isEmpty() && getenv( "HOME" ) )
+aDir = rtl::OUString( getenv( "HOME" ), strlen( getenv( "HOME"
) ), osl_getThreadTextEncoding() );
break;
}
}
@@ -137,7 +138,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData& rData )
pJobSetup->meOrientation= (Orientation)(rData.m_eOrientation ==
orientation::Landscape ? ORIENTATION_LANDSCAPE
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/inc oox/Library_oox.mk oox/source
oox/Library_oox.mk|1
oox/inc/oox/drawingml/diagram/diagram.hxx |2
oox/inc/oox/drawingml/shape.hxx |5 +
oox/inc/oox/ppt/pptshapegroupcontext.hxx |3
oox/source/core/xmlfilterbase.cxx |6 -
oox/source/drawingml/diagram/datamodelcontext.cxx |9 +-
oox/source/drawingml/diagram/diagram.cxx |9 +-
oox/source/drawingml/diagram/diagram.hxx |3
oox/source/drawingml/shape.cxx|7 +
oox/source/ppt/extdrawingfragmenthandler.cxx | 95 ++
oox/source/ppt/extdrawingfragmenthandler.hxx | 71
oox/source/ppt/pptshapecontext.cxx|2
oox/source/ppt/pptshapegroupcontext.cxx | 28 ++
oox/source/token/namespaces.hxx.tail |1
oox/source/token/namespaces.txt |1
oox/source/token/tokens.txt |2
16 files changed, 236 insertions(+), 9 deletions(-)
New commits:
commit b9977b7a23ba4d9fc739133b6aa199f5d6cdec35
Author: Muthu Subramanian
Date: Fri Dec 30 16:09:42 2011 +0530
n#655408: Importing extLst of drawings in diagrams.
data*.xml contains the list of drawings which can be imported
instead. These are easier to import now that we support better
smartart.
Signed-off-by: Jan Holesovsky
Signed-off-by: Michael Meeks
Signed-off-by: Miklos Vajna
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0b54125..098d747 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -266,6 +266,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/ppt/timenode \
oox/source/ppt/timenodelistcontext \
oox/source/ppt/timetargetelementcontext \
+oox/source/ppt/extdrawingfragmenthandler \
oox/source/shape/ShapeContextHandler \
oox/source/shape/ShapeFilterBase \
oox/source/token/namespacemap \
diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx
b/oox/inc/oox/drawingml/diagram/diagram.hxx
index 9b75667..4c0a40d 100644
--- a/oox/inc/oox/drawingml/diagram/diagram.hxx
+++ b/oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace drawingml {
generate and layout the shapes, and push it as children into the
referenced shape.
*/
-void loadDiagram( const ShapePtr& pShape,
+void loadDiagram( ShapePtr& pShape,
core::XmlFilterBase& rFilter,
const ::rtl::OUString& rDataModelPath,
const ::rtl::OUString& rLayoutPath,
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index ab7637a..772f699 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -107,6 +107,7 @@ public:
void setChildPosition(
com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
void setChildSize( com::sun::star::awt::Size
aSize ){ maChSize = aSize; }
+void moveAllToPosition( const
com::sun::star::awt::Point &rPoint );
void setPosition( com::sun::star::awt::Point
nPosition ){ maPosition = nPosition; }
const com::sun::star::awt::Point& getPosition() const { return maPosition;
}
@@ -173,6 +174,9 @@ public:
getXShape() const { return mxShape; }
virtual voidapplyShapeReference( const Shape& rReferencedShape );
+const ::std::vector&
+getExtDrawings() { return maExtDrawings; }
+voidaddExtDrawingRelId( const ::rtl::OUString &rRelId ) {
maExtDrawings.push_back( rRelId ); }
protected:
@@ -233,6 +237,7 @@ protected:
com::sun::star::awt::Size maSize;
com::sun::star::awt::Point maPosition;
+::std::vectormaExtDrawings;
private:
enum FrameType
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 948ee79..7e2a6d3 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -38,6 +38,7 @@ class PPTShapeGroupContext : public
::oox::drawingml::ShapeGroupContext
{
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
+oox::drawingml::ShapePtrpGraphicShape;
public:
PPTShapeGroupContext(
@@ -50,6 +51,8 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element, const
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
+
prot
[Libreoffice-commits] .: TEMPLATE.SOURCECODE.HEADER
TEMPLATE.SOURCECODE.HEADER |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0cfb61650ae8a6f9cea989ac4423e03168a595f0 Author: Stephan Bergmann Date: Thu Jan 5 11:59:11 2012 +0100 Bump year. diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER index 48a85b8..cae6935 100644 --- a/TEMPLATE.SOURCECODE.HEADER +++ b/TEMPLATE.SOURCECODE.HEADER @@ -14,8 +14,8 @@ * * Major Contributor(s): <<< - * [ Copyright (C) 2011 Jim Bob (initial developer) ] - * [ Copyright (C) 2011 Ted ] + * [ Copyright (C) 2012 Jim Bob (initial developer) ] + * [ Copyright (C) 2012 Ted ] >>> * * All Rights Reserved. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppu/source
cppu/source/typelib/typelib.cxx | 222 +---
1 file changed, 119 insertions(+), 103 deletions(-)
New commits:
commit 0ba6bd3ddc025666a6d4bb0640bf443728b23bd3
Author: Stephan Bergmann
Date: Thu Jan 5 11:58:40 2012 +0100
Leak TypeDescriptor_Init_Impl to avoid problems at exit.
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index fec9f04..a0ed525 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -368,18 +368,26 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
SAL_THROW( () )
}
};
-namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init >
{}; }
+namespace {
+
+struct Init: public rtl::StaticWithInit< TypeDescriptor_Init_Impl *, Init > {
+TypeDescriptor_Init_Impl * operator ()() const {
+return new TypeDescriptor_Init_Impl; // leaked
+}
+};
+
+}
extern "C" CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_registerCallback(
void * pContext, typelib_typedescription_Callback pCallback )
SAL_THROW_EXTERN_C()
{
// todo mt safe: guard is no solution, can not acquire while calling
callback!
-TypeDescriptor_Init_Impl &rInit = Init::get();
-// OslGuard aGuard( rInit.getMutex() );
-if( !rInit.pCallbacks )
-rInit.pCallbacks = new CallbackSet_Impl;
-rInit.pCallbacks->push_back( CallbackEntry( pContext, pCallback ) );
+TypeDescriptor_Init_Impl *rInit = Init::get();
+// OslGuard aGuard( rInit->getMutex() );
+if( !rInit->pCallbacks )
+rInit->pCallbacks = new CallbackSet_Impl;
+rInit->pCallbacks->push_back( CallbackEntry( pContext, pCallback ) );
}
//
@@ -387,19 +395,19 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_revokeCallback(
void * pContext, typelib_typedescription_Callback pCallback )
SAL_THROW_EXTERN_C()
{
-TypeDescriptor_Init_Impl &rInit = Init::get();
-if( rInit.pCallbacks )
+TypeDescriptor_Init_Impl *rInit = Init::get();
+if( rInit->pCallbacks )
{
// todo mt safe: guard is no solution, can not acquire while calling
callback!
-// OslGuard aGuard( rInit.getMutex() );
+// OslGuard aGuard( rInit->getMutex() );
CallbackEntry aEntry( pContext, pCallback );
-CallbackSet_Impl::iterator iPos( rInit.pCallbacks->begin() );
-while (!(iPos == rInit.pCallbacks->end()))
+CallbackSet_Impl::iterator iPos( rInit->pCallbacks->begin() );
+while (!(iPos == rInit->pCallbacks->end()))
{
if (*iPos == aEntry)
{
-rInit.pCallbacks->erase( iPos );
-iPos = rInit.pCallbacks->begin();
+rInit->pCallbacks->erase( iPos );
+iPos = rInit->pCallbacks->begin();
}
else
{
@@ -445,7 +453,7 @@ static inline void typelib_typedescription_initTables(
}
}
-MutexGuard aGuard( Init::get().getMutex() );
+MutexGuard aGuard( Init::get()->getMutex() );
if( !pTD->bComplete )
{
// create the index table from member to function table
@@ -518,8 +526,8 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool
initTables) {
typelib_TypeDescription * pTD = 0;
// on demand access of complete td
-TypeDescriptor_Init_Impl &rInit = Init::get();
-rInit.callChain( &pTD, (*ppTypeDescr)->pTypeName );
+TypeDescriptor_Init_Impl *rInit = Init::get();
+rInit->callChain( &pTD, (*ppTypeDescr)->pTypeName );
if (pTD)
{
if (typelib_TypeClass_TYPEDEF == pTD->eTypeClass)
@@ -552,17 +560,17 @@ bool complete(typelib_TypeDescription ** ppTypeDescr,
bool initTables) {
OSL_ASSERT( pTD == *ppTypeDescr ); // has to merge into existing
one
// insert into the chache
-MutexGuard aGuard( rInit.getMutex() );
-if( !rInit.pCache )
-rInit.pCache = new TypeDescriptionList_Impl;
-if( (sal_Int32)rInit.pCache->size() >= nCacheSize )
+MutexGuard aGuard( rInit->getMutex() );
+if( !rInit->pCache )
+rInit->pCache = new TypeDescriptionList_Impl;
+if( (sal_Int32)rInit->pCache->size() >= nCacheSize )
{
-typelib_typedescription_release( rInit.pCache->front() );
-rInit.pCache->pop_front();
+typelib_typedescription_release( rInit->pCache->front() );
+rInit->pCache->pop_front();
}
// descriptions in the cache must be acquired!
typelib_typedescription_acquire( pTD );
-rInit.pCache->push_back( pTD );
+rInit->pCache->push_back( pTD );
OSL_ASSERT(
pTD->bComplete
@@ -611,7 +619,7 @@ extern "C" void SAL_CALL typelib_typedescripti
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/PageBreakWin.cxx | 21 +++--
1 file changed, 3 insertions(+), 18 deletions(-)
New commits:
commit 3a326395a48db313b907b4a35392216d7b2e2a11
Author: Cédric Bosdonnat
Date: Thu Jan 5 11:34:49 2012 +0100
Page Break: center the tab on the mouse and remove click on the line
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index b16e51f..f954b6e 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -125,7 +125,6 @@ namespace
m_pWin( pWin ) {};
virtual void MouseMove( const MouseEvent& rMEvt );
-virtual void MouseButtonDown( const MouseEvent& rMEvt );
};
void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt )
@@ -148,16 +147,6 @@ namespace
m_pWin->UpdatePosition( pPtr );
}
}
-
-void SwBreakDashedLine::MouseButtonDown( const MouseEvent& rMEvt )
-{
-sal_uInt16 nItemId = m_pWin->GetPopupMenu()->Execute( this,
rMEvt.GetPosPixel() );
-if ( nItemId )
-{
-m_pWin->SetCurItemId( nItemId );
-m_pWin->Select();
-}
-}
}
SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm
) :
@@ -452,14 +441,10 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
if ( m_pMousePt )
{
-nBtnLeft = nLineLeft + m_pMousePt->X();
+nBtnLeft = nLineLeft + m_pMousePt->X() - aBtnSize.getWidth() / 2;
-if ( Application::GetSettings().GetLayoutRTL() )
-{
-nBtnLeft -= aBtnSize.getWidth();
-if ( nBtnLeft < nLineLeft )
-nBtnLeft = nLineLeft;
-}
+if ( nBtnLeft < nLineLeft )
+nBtnLeft = nLineLeft;
else if ( ( nBtnLeft + aBtnSize.getWidth() ) > nLineRight )
nBtnLeft = nLineRight - aBtnSize.getWidth();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/Library_fps.mk
fpicker/Library_fps.mk |1 + 1 file changed, 1 insertion(+) New commits: commit cff24b6fa1d566a614339e8ba82568a7d79f7757 Author: Michael Stahl Date: Thu Jan 5 11:10:06 2012 +0100 fpicker: add missing comphelper diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index a7e8b7e..3d8a0a5 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_defs,fps,\ )) $(eval $(call gb_Library_add_linked_libs,fps,\ + comphelper \ cppu \ cppuhelper \ sal \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/Extension.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit b047d494130a21b748a77e05f1843e0e897b6f8e Author: David Tardon Date: Thu Jan 5 10:20:24 2012 +0100 always put unlocalized properties files to the oxt Signed-off-by: David Tardon diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 6044f4f..7f004f6 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -127,15 +127,18 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties +$(call gb_Extension_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) +$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf $(call gb_Extension_get_target,$(1)) : $$(SDF2) +endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) $(call gb_Extension_get_workdir,$(1))/$(2) : $(3) $(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ +ifneq ($(strip $(gb_WITH_LANG)),) $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/bitmap3.cxx | 76 +++--
1 file changed, 39 insertions(+), 37 deletions(-)
New commits:
commit bb0438f010893b6bc083aac6c1037f9a80ae8add
Author: Norbert Thiebaud
Date: Thu Jan 5 03:24:16 2012 -0600
potential null pointer dereference
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 19f5f25..a2b8587 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -949,63 +949,65 @@ sal_Bool Bitmap::ImplScaleFast( const double& rScaleX,
const double& rScaleY )
const Size aSizePix( GetSizePixel() );
const long nNewWidth = FRound( aSizePix.Width() * rScaleX );
const long nNewHeight = FRound( aSizePix.Height() * rScaleY );
-sal_BoolbRet = sal_False;
+sal_BoolbRet = sal_False;
if( nNewWidth && nNewHeight )
{
BitmapReadAccess* pReadAcc = AcquireReadAccess();
-Bitmap aNewBmp( Size( nNewWidth, nNewHeight ),
GetBitCount(), &pReadAcc->GetPalette() );
-BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
-if( pReadAcc && pWriteAcc )
+if(pReadAcc)
{
-const long nScanlineSize = pWriteAcc->GetScanlineSize();
-const long nNewWidth1 = nNewWidth - 1L;
-const long nNewHeight1 = nNewHeight - 1L;
-const long nWidth = pReadAcc->Width();
-const long nHeight = pReadAcc->Height();
-long* pLutX = new long[ nNewWidth ];
-long* pLutY = new long[ nNewHeight ];
-
-if( nNewWidth1 && nNewHeight1 )
-{
-longnX, nY, nMapY, nActY = 0L;
-
-for( nX = 0L; nX < nNewWidth; nX++ )
-pLutX[ nX ] = nX * nWidth / nNewWidth;
-
-for( nY = 0L; nY < nNewHeight; nY++ )
-pLutY[ nY ] = nY * nHeight / nNewHeight;
+Bitmap aNewBmp( Size( nNewWidth, nNewHeight ),
GetBitCount(), &pReadAcc->GetPalette() );
+BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
-while( nActY < nNewHeight )
+if( pWriteAcc )
+{
+const long nScanlineSize = pWriteAcc->GetScanlineSize();
+const long nNewWidth1 = nNewWidth - 1L;
+const long nNewHeight1 = nNewHeight - 1L;
+const long nWidth = pReadAcc->Width();
+const long nHeight = pReadAcc->Height();
+long* pLutX = new long[ nNewWidth ];
+long* pLutY = new long[ nNewHeight ];
+
+if( nNewWidth1 && nNewHeight1 )
{
-nMapY = pLutY[ nActY ];
+longnX, nY, nMapY, nActY = 0L;
for( nX = 0L; nX < nNewWidth; nX++ )
-pWriteAcc->SetPixel( nActY, nX, pReadAcc->GetPixel(
nMapY , pLutX[ nX ] ) );
+pLutX[ nX ] = nX * nWidth / nNewWidth;
+
+for( nY = 0L; nY < nNewHeight; nY++ )
+pLutY[ nY ] = nY * nHeight / nNewHeight;
-while( ( nActY < nNewHeight1 ) && ( pLutY[ nActY + 1 ] ==
nMapY ) )
+while( nActY < nNewHeight )
{
-memcpy( pWriteAcc->GetScanline( nActY + 1L ),
- pWriteAcc->GetScanline( nActY ),
nScanlineSize );
+nMapY = pLutY[ nActY ];
+
+for( nX = 0L; nX < nNewWidth; nX++ )
+pWriteAcc->SetPixel( nActY, nX,
pReadAcc->GetPixel( nMapY , pLutX[ nX ] ) );
+
+while( ( nActY < nNewHeight1 ) && ( pLutY[ nActY + 1 ]
== nMapY ) )
+{
+memcpy( pWriteAcc->GetScanline( nActY + 1L ),
+pWriteAcc->GetScanline( nActY ),
nScanlineSize );
+nActY++;
+}
nActY++;
}
-nActY++;
+bRet = sal_True;
+aNewBmp.ReleaseAccess( pWriteAcc );
}
-bRet = sal_True;
+delete[] pLutX;
+delete[] pLutY;
}
+ReleaseAccess( pReadAcc );
-delete[] pLutX;
-delete[] pLutY;
+if( bRet )
+ImplAssignWithSize( aNewBmp );
}
-
-ReleaseAccess( pReadAcc );
-aNewBmp.ReleaseAccess( pWriteAcc );
-
-if( bRet )
-ImplAssignWithSize( aNewBmp );
}
return bRet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Extension.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 42b50a1234f2047e4d4eb4c4da37919eb61a047e Author: David Tardon Date: Thu Jan 5 10:20:24 2012 +0100 always put unlocalized properties files to the oxt diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 8e2e409..3069408 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -127,15 +127,18 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties +$(call gb_Extension_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) +$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf $(call gb_Extension_get_target,$(1)) : $$(SDF2) +endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) $(call gb_Extension_get_workdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ +ifneq ($(strip $(gb_WITH_LANG)),) $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx | 16
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx|3
binfilter/bf_sch/source/core/sch_chtmodel.cxx |6
binfilter/bf_sch/source/core/sch_memchrt.cxx |6
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx| 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx| 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx |5
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx| 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 14
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 11
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx |7
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx| 180
--
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx |8
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 26 -
binfilter/bf_sw/source/core/layout/sw_laycache.cxx|9
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx |3
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 18 -
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 76
binfilter/bf_sw/source/core/text/sw_guess.cxx | 11
binfilter/bf_sw/source/core/text/sw_itrform2.cxx |3
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx|4
binfilter/bf_sw/source/core/text/sw_txtftn.cxx| 13
binfilter/bf_sw/source/core/text/sw_txtio.cxx |6
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx |3
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx |4
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx|8
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx|6
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx |9
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 26 -
binfilter/inc/bf_sw/iodetect.hxx | 17
31 files changed, 62 insertions(+), 476 deletions(-)
New commits:
commit 96bcd0c08004d7bd69c3a77c731f3401ceafede0
Author: Caolán McNamara
Date: Wed Dec 28 08:55:15 2011 +
WaE and build errors with OSL_DEBUG_LEVEL == 2
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index 2d2cef7..9f47454 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -1865,22 +1865,6 @@ void ScInterpreter::ScBase()
// so ist es etwas besser
double fInt = ::rtl::math::approxFloor( fVal / fBase );
double fMult = fInt * fBase;
-#if OSL_DEBUG_LEVEL > 1
-// #53943# =BASIS(1e308;36) => GPF mit
-// nDig = (size_t) ::rtl::math::approxFloor( fVal - fMult
);
-// trotz vorheriger Pruefung ob fVal >= fMult
-double fDebug1 = fVal - fMult;
-// fVal:= 7,5975311883090e+290
-// fMult := 7,5975311883090e+290
-// fDebug1 := 1,3848924157003e+275 <- RoundOff-Error
-// fVal != fMult, aber: ::rtl::math::approxEqual( fVal,
fMult ) == TRUE
-double fDebug2 = ::rtl::math::approxSub( fVal, fMult );
-// und ::rtl::math::approxSub( fVal, fMult ) == 0
-double fDebug3 = ( fInt ? fVal / fInt : 0.0 );
-// Nach dem strange fDebug1 und fVal < fMult ist
eigentlich
-// fDebug2 == fBase, trotzdem wird das mit einem Vergleich
-// nicht erkannt, dann schlaegt bDirt zu und alles wird
wieder gut..
-#endif
size_t nDig;
if ( fVal < fMult )
{ // da ist was gekippt
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index a1bceb8..463caa3 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -936,9 +936,6 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32
nStartColumn, const sa
sal_Int32 nColumns = 0;
while (aItr != pFormatRanges->end() && nColumns < nTotalColumns)
{
-#if OSL_DEBUG_LEVEL > 1
-table::CellRangeAddress aTempRangeAddress = (*aItr).aRangeAddress;
-#endif
if (((*aItr).aRangeAddress.StartRow <= nRow) &&
((*aItr).aRangeAddress.EndRow >= nRow))
{
diff --git a/binfilter/bf_sch/source/core/sch_
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 6 commits - nlpsolver/Extension_nlpsolver.mk solenv/gbuild swext/Extension_wiki-publisher.mk
nlpsolver/Extension_nlpsolver.mk | 18 -- solenv/gbuild/Extension.mk| 36 +++- swext/Extension_wiki-publisher.mk |6 +- 3 files changed, 48 insertions(+), 12 deletions(-) New commits: commit 5be4e4dc9d21d4b201a601e12b605eea007e1db0 Author: Andras Timar Date: Wed Jan 4 22:58:16 2012 +0100 build and pack MediaWiki extension's help localizations diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 4db566d..1b6eb51 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -61,4 +61,8 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publi $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp)) $(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html)) $(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott)) - +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp)) commit 8c7dadd0cbd6356b9728d0fa71c6ff4fea75804c Author: Andras Timar Date: Wed Jan 4 22:22:50 2012 +0100 build and pack NLPSolver help localizations diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index cfe27f6..b7de4b0 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -39,7 +39,11 @@ $(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties)) $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ +$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ +$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ + $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) +$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ + $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) +$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) commit a992230c142a09c2ba0536911a13ef6cf47d2c4c Author: David Tardon Date: Wed Jan 4 08:28:04 2012 +0100 just list the files explicitly diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index 542892b..cfe27f6 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -33,10 +33,12 @@ $(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver $(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar)) $(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar)) -$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.default), \ - $(eval $(call gb_Extension_add_file,nlpsolver,locale/$(notdir $(trans)),$(trans) -$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.properties), \ - $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/$(notdir $(trans)),$(trans) +$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverCommon_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.default)) +$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.default)) + +$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Extension.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f84109c4577866227ac0d89368dfdceb5599954c Author: David Tardon Date: Thu Jan 5 09:44:14 2012 +0100 do not announce if nothing is done (without langs) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 6044f4f..8e2e409 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -133,7 +133,7 @@ $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subs $(call gb_Extension_get_target,$(1)) : $$(SDF2) $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) $(call gb_Extension_get_workdir,$(1))/$(2) : $(3) - $(call gb_Output_announce,$(2),$(true),PRP,3) + $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dictionaries/fr_FR
dictionaries/fr_FR/README_fr.txt |4 dictionaries/fr_FR/description.xml |3 dictionaries/fr_FR/fr.aff | 56 ++--- dictionaries/fr_FR/fr.dic | 283 ++--- dictionaries/fr_FR/french_flag.png |binary dictionaries/fr_FR/makefile.mk |1 dictionaries/fr_FR/package-description.txt |2 7 files changed, 180 insertions(+), 169 deletions(-) New commits: commit b8719c4a9a10ba290abab059d675f7d55f702318 Author: Olivier R Date: Wed Jan 4 18:56:37 2012 +0100 Update French dictionaries 4.4 -> 4.4.1 + flag diff --git a/dictionaries/fr_FR/README_fr.txt b/dictionaries/fr_FR/README_fr.txt index 500bbe8..2e7f88d 100644 --- a/dictionaries/fr_FR/README_fr.txt +++ b/dictionaries/fr_FR/README_fr.txt @@ -1,7 +1,7 @@ ___ - DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «Moderne» - version 4.4 + DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «MODERNE» + version 4.4.1 Olivier R. - dicollectefreefr Dicollecte : http://www.dicollecte.org/ diff --git a/dictionaries/fr_FR/description.xml b/dictionaries/fr_FR/description.xml index 6d536d9..ad2dd05 100644 --- a/dictionaries/fr_FR/description.xml +++ b/dictionaries/fr_FR/description.xml @@ -9,6 +9,9 @@ + + + http://www.dicollecte.org/"; lang="fr">Dicollecte diff --git a/dictionaries/fr_FR/fr.aff b/dictionaries/fr_FR/fr.aff index e3f5f66..f91bcb0 100644 --- a/dictionaries/fr_FR/fr.aff +++ b/dictionaries/fr_FR/fr.aff @@ -1,6 +1,6 @@ -# AFFIXES DU DICTIONNAIRE FRANÃAIS «Moderne» v4.4 +# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «MODERNE» v4.4.1 # par Olivier R. -- licences LGPL, GPL, MPL -# Généré le 20 December 2011 à 17:03 +# Généré le 28 December 2011 à 21:22 # Pour améliorer le dictionnaire, allez sur http://www.dicollecte.org/ @@ -163,7 +163,7 @@ COMPOUNDFLAG == -AM 298 +AM 296 AM po:nom is:mas AM po:nom is:fem AM po:adj @@ -377,12 +377,10 @@ AM po:v1t is:infi AM po:v1iîp AM po:v1itpm AM po:v1itm -AM po:v1 AM po:v0e AM po:v0a AM po:tag -AM po:prn po:geo is:fem -AM po:prn is:fem +AM po:prn po:geo is:epi is:inv AM po:pfx AM po:patr is:fem is:inv AM po:patr @@ -576,6 +574,7 @@ AF f3p+() AF f1p.() AF a5p.() AF Ui() +AF S= AF yU() AF xP() AF xO() @@ -595,7 +594,6 @@ AF iDq+() AF c5p.() AF b0p.() AF a8p+() -AF S= AF L'D'Q'Q* AF D'Q'Qj AF A*() @@ -792,15 +790,15 @@ PFX Q' Å qu'Å Å 97 PFX Q' æ qu'à æ 97 PFX Q* Y 3 -PFX Q* 0 quoiqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 292 -PFX Q* 0 puisqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 293 -PFX Q* 0 lorsqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 296 +PFX Q* 0 quoiqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 290 +PFX Q* 0 puisqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 291 +PFX Q* 0 lorsqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 294 PFX Qj Y 1 -PFX Qj 0 jusqu' [aà âeèéêiîoôuyhÅæ] 297 +PFX Qj 0 jusqu' [aà âeèéêiîoôuyhÅæ] 295 PFX Si Y 1 -PFX Si 0 s' . 290 +PFX Si 0 s' . 288 SFX S. Y 2 SFX S. 0 0 . 118 @@ -1120,7 +1118,7 @@ PFX U. 0 z . PFX U. 0 y . PFX n' Y 1 -PFX n' 0 n' [aà âeèéêiîoôuyhÅæ] 294 +PFX n' 0 n' [aà âeèéêiîoôuyhÅæ] 292 PFX q' Y 1 PFX q' 0 qu' [aà âeèéêiîoôuyhÅæ] 201 @@ -1129,7 +1127,7 @@ PFX d' Y 1 PFX d' 0 d' [aà âeèéêiîoôuyhÅæ] 97 PFX j' Y 1 -PFX j' 0 j' [aà âeèéêiîoôuyhÅæ] 298 +PFX j' 0 j' [aà âeèéêiîoôuyhÅæ] 296 PFX c' Y 2 PFX c' 0 c' [eé] 202 @@ -1139,13 +1137,13 @@ PFX l' Y 1 PFX l' 0 l' [aà âeèéêiîoôuyhÅæ] 108 PFX m' Y 1 -PFX m' 0 m' [aà âeèéêiîoôuyhÅæ] 295 +PFX m' 0 m' [aà âeèéêiîoôuyhÅæ] 293 PFX t' Y 1 -PFX t' 0 t' [aà âeèéêiîoôuyhÅæ] 289 +PFX t' 0 t' [aà âeèéêiîoôuyhÅæ] 287 PFX s' Y 1 -PFX s' 0 s' [aà âeèéêiîoôuyhÅæ] 291 +PFX s' 0 s' [aà âeèéêiîoôuyhÅæ] 289 SFX zA Y 52 SFX zA voir voir/225 avoir 62 @@ -1207,16 +1205,16 @@ SFX zE être étant/6 être 48 SFX zE être été être 104 SFX zE être suis être 34 SFX zE être es/20 être 35 -SFX zE être est/123 être 21 +SFX zE être est/124 être 21 SFX zE être sommes être 55 SFX zE tre tes/14 être 71 SFX zE être sont être 26 SFX zE être étais/22 être 64 SFX zE être étais/20 être 63 -SFX zE être était/123 être 50 +SFX zE être était/124 être 50 SFX zE être étions/17 être 77 SFX zE être étiez/14 être 76 -SFX zE être étaient/123 être 51 +SFX zE être étaient/124 être 51 SFX zE être fus être 69 SFX zE être fussé-je être 163 SFX zE être fus être 68 @@ -4986,7 +4984,7 @@ SFX c4 éger égeons/46 éger 57 SFX c4 er ez/31 er 75 SFX c5 Y 263 -SFX c5 er er/124 er 62 +SFX c5 er er/125 er 62 SFX c5 er ant/159 [^cg]er 48 SFX c5 écer éçant/159 écer 48 SFX c5 éger égeant/
[Libreoffice-commits] .: dictionaries/fr_FR
dictionaries/fr_FR/README_fr.txt |4 dictionaries/fr_FR/description.xml |3 dictionaries/fr_FR/fr.aff | 56 ++--- dictionaries/fr_FR/fr.dic | 283 ++--- dictionaries/fr_FR/french_flag.png |binary dictionaries/fr_FR/makefile.mk |1 dictionaries/fr_FR/package-description.txt |2 7 files changed, 180 insertions(+), 169 deletions(-) New commits: commit 3913f7b98aa13db4b62d3aee9313a49c05ec86e0 Author: Olivier R Date: Wed Jan 4 18:56:37 2012 +0100 Update French dictionaries 4.4 -> 4.4.1 + flag diff --git a/dictionaries/fr_FR/README_fr.txt b/dictionaries/fr_FR/README_fr.txt index 500bbe8..2e7f88d 100644 --- a/dictionaries/fr_FR/README_fr.txt +++ b/dictionaries/fr_FR/README_fr.txt @@ -1,7 +1,7 @@ ___ - DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «Moderne» - version 4.4 + DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «MODERNE» + version 4.4.1 Olivier R. - dicollectefreefr Dicollecte : http://www.dicollecte.org/ diff --git a/dictionaries/fr_FR/description.xml b/dictionaries/fr_FR/description.xml index 6d536d9..ad2dd05 100644 --- a/dictionaries/fr_FR/description.xml +++ b/dictionaries/fr_FR/description.xml @@ -9,6 +9,9 @@ + + + http://www.dicollecte.org/"; lang="fr">Dicollecte diff --git a/dictionaries/fr_FR/fr.aff b/dictionaries/fr_FR/fr.aff index e3f5f66..f91bcb0 100644 --- a/dictionaries/fr_FR/fr.aff +++ b/dictionaries/fr_FR/fr.aff @@ -1,6 +1,6 @@ -# AFFIXES DU DICTIONNAIRE FRANÃAIS «Moderne» v4.4 +# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS «MODERNE» v4.4.1 # par Olivier R. -- licences LGPL, GPL, MPL -# Généré le 20 December 2011 à 17:03 +# Généré le 28 December 2011 à 21:22 # Pour améliorer le dictionnaire, allez sur http://www.dicollecte.org/ @@ -163,7 +163,7 @@ COMPOUNDFLAG == -AM 298 +AM 296 AM po:nom is:mas AM po:nom is:fem AM po:adj @@ -377,12 +377,10 @@ AM po:v1t is:infi AM po:v1iîp AM po:v1itpm AM po:v1itm -AM po:v1 AM po:v0e AM po:v0a AM po:tag -AM po:prn po:geo is:fem -AM po:prn is:fem +AM po:prn po:geo is:epi is:inv AM po:pfx AM po:patr is:fem is:inv AM po:patr @@ -576,6 +574,7 @@ AF f3p+() AF f1p.() AF a5p.() AF Ui() +AF S= AF yU() AF xP() AF xO() @@ -595,7 +594,6 @@ AF iDq+() AF c5p.() AF b0p.() AF a8p+() -AF S= AF L'D'Q'Q* AF D'Q'Qj AF A*() @@ -792,15 +790,15 @@ PFX Q' Å qu'Å Å 97 PFX Q' æ qu'à æ 97 PFX Q* Y 3 -PFX Q* 0 quoiqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 292 -PFX Q* 0 puisqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 293 -PFX Q* 0 lorsqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 296 +PFX Q* 0 quoiqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 290 +PFX Q* 0 puisqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 291 +PFX Q* 0 lorsqu' [aà âeèéêiîoôuyhÅæAÃÃEÃÃÃIÃOÃUYHÅÃ] 294 PFX Qj Y 1 -PFX Qj 0 jusqu' [aà âeèéêiîoôuyhÅæ] 297 +PFX Qj 0 jusqu' [aà âeèéêiîoôuyhÅæ] 295 PFX Si Y 1 -PFX Si 0 s' . 290 +PFX Si 0 s' . 288 SFX S. Y 2 SFX S. 0 0 . 118 @@ -1120,7 +1118,7 @@ PFX U. 0 z . PFX U. 0 y . PFX n' Y 1 -PFX n' 0 n' [aà âeèéêiîoôuyhÅæ] 294 +PFX n' 0 n' [aà âeèéêiîoôuyhÅæ] 292 PFX q' Y 1 PFX q' 0 qu' [aà âeèéêiîoôuyhÅæ] 201 @@ -1129,7 +1127,7 @@ PFX d' Y 1 PFX d' 0 d' [aà âeèéêiîoôuyhÅæ] 97 PFX j' Y 1 -PFX j' 0 j' [aà âeèéêiîoôuyhÅæ] 298 +PFX j' 0 j' [aà âeèéêiîoôuyhÅæ] 296 PFX c' Y 2 PFX c' 0 c' [eé] 202 @@ -1139,13 +1137,13 @@ PFX l' Y 1 PFX l' 0 l' [aà âeèéêiîoôuyhÅæ] 108 PFX m' Y 1 -PFX m' 0 m' [aà âeèéêiîoôuyhÅæ] 295 +PFX m' 0 m' [aà âeèéêiîoôuyhÅæ] 293 PFX t' Y 1 -PFX t' 0 t' [aà âeèéêiîoôuyhÅæ] 289 +PFX t' 0 t' [aà âeèéêiîoôuyhÅæ] 287 PFX s' Y 1 -PFX s' 0 s' [aà âeèéêiîoôuyhÅæ] 291 +PFX s' 0 s' [aà âeèéêiîoôuyhÅæ] 289 SFX zA Y 52 SFX zA voir voir/225 avoir 62 @@ -1207,16 +1205,16 @@ SFX zE être étant/6 être 48 SFX zE être été être 104 SFX zE être suis être 34 SFX zE être es/20 être 35 -SFX zE être est/123 être 21 +SFX zE être est/124 être 21 SFX zE être sommes être 55 SFX zE tre tes/14 être 71 SFX zE être sont être 26 SFX zE être étais/22 être 64 SFX zE être étais/20 être 63 -SFX zE être était/123 être 50 +SFX zE être était/124 être 50 SFX zE être étions/17 être 77 SFX zE être étiez/14 être 76 -SFX zE être étaient/123 être 51 +SFX zE être étaient/124 être 51 SFX zE être fus être 69 SFX zE être fussé-je être 163 SFX zE être fus être 68 @@ -4986,7 +4984,7 @@ SFX c4 éger égeons/46 éger 57 SFX c4 er ez/31 er 75 SFX c5 Y 263 -SFX c5 er er/124 er 62 +SFX c5 er er/125 er 62 SFX c5 er ant/159 [^cg]er 48 SFX c5 écer éçant/159 écer 48 SFX c5 éger égeant/
