LibreOffice Gerrit News for core on 2014-06-24
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Replace the whole content for copied documents in https://gerrit.libreoffice.org/9862 from Jan-Marek Glogowski about module sw + Save debug mail merge documents in https://gerrit.libreoffice.org/9860 from Jan-Marek Glogowski about module sw + MM: always copy the internal document in https://gerrit.libreoffice.org/9863 from Jan-Marek Glogowski about module sw + Update SwDoc::Paste from SwFEShell::Paste in https://gerrit.libreoffice.org/9861 from Jan-Marek Glogowski about module sw + fdo#79880: After RT document corrupted due to invalid hyperlink. in https://gerrit.libreoffice.org/9751 from Yogesh Bharate about module sw, tools End of freshness + Make Draw use paper size when printing - fdo#63905 in https://gerrit.libreoffice.org/9866 from Eilidh McAdam about module sd + fdo#80373 Updated label to read Image background transparency in https://gerrit.libreoffice.org/9865 from Joel Madero about module cui * Merged changes on master for project core changed in the last 25 hours: + Convert DLG_ASS to .ui in https://gerrit.libreoffice.org/9834 from Mihály Palenik + LOK: kill saveAsWithOptions. in https://gerrit.libreoffice.org/9815 from Andrzej Hunt + fdo#76203 - use consistent titlecase for UI title labels in https://gerrit.libreoffice.org/9858 from Joren De Cuyper * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Define DINDEX_PAGE_SIZE to PAGE_SIZE on FreeBSD in https://gerrit.libreoffice.org/9731 from Baptiste Daroussin + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + configure, gbuild: remove Cygwin paths from make environment in https://gerrit.libreoffice.org/9698 from Michael Stahl + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/svx svx/source
include/svx/unoshtxt.hxx |2 -
svx/source/table/cell.cxx | 56 +++--
svx/source/table/cell.hxx | 10 --
svx/source/table/tablelayouter.cxx |8 ++---
svx/source/unodraw/unoshape.cxx|6 +--
svx/source/unodraw/unoshtxt.cxx| 16 +++---
6 files changed, 20 insertions(+), 78 deletions(-)
New commits:
commit 45f18e2ff2a54c412f296818fd73111cb62c7f3d
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jun 23 21:18:14 2014 +0200
sdr::table::Cell's XServiceInfo cleaning
There is no com.sun.star.table.cell / com.sun.star.drawing.cell.
And remove unused XFastPropertySet methods which were not marked as
override.
Change-Id: I92c856ef16387758d00174708094b0e0c3a38bac
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 1b9a982..a4a37a9 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -858,27 +858,6 @@ Sequence sal_Int8 SAL_CALL Cell::getImplementationId(
) throw (RuntimeExcept
return css::uno::Sequencesal_Int8();
}
-// XServiceInfo
-OUString SAL_CALL Cell::getImplementationName( ) throw (RuntimeException,
std::exception)
-{
-return OUString( com.sun.star.comp.svx.table.Cell );
-}
-
-sal_Bool SAL_CALL Cell::supportsService( const OUString ServiceName ) throw
(RuntimeException, std::exception)
-{
-return cppu::supportsService( this, ServiceName );
-}
-
-Sequence OUString SAL_CALL Cell::getSupportedServiceNames( ) throw
(RuntimeException, std::exception)
-{
-Sequence OUString aSeq( SvxUnoTextBase::getSupportedServiceNames() );
-sal_Int32 nIndex = aSeq.getLength();
-aSeq.realloc( nIndex + 2 );
-aSeq[nIndex++] = com.sun.star.table.cell;
-aSeq[nIndex++] = com.sun.star.drawing.cell;
-return aSeq;
-}
-
// XLayoutConstrains
::com::sun::star::awt::Size SAL_CALL Cell::getMinimumSize()
throw (RuntimeException,
@@ -1625,25 +1604,6 @@ Sequence Any SAL_CALL Cell::getPropertyDefaults(
const Sequence OUString
}
-// XFastPropertySet
-
-
-void SAL_CALL Cell::setFastPropertyValue( sal_Int32 nHandle, const Any aValue
) throw (UnknownPropertyException, PropertyVetoException,
IllegalArgumentException, WrappedTargetException, RuntimeException)
-{
-(void)aValue;
-(void)nHandle;
-throw UnknownPropertyException();
-}
-
-
-// TODO: Refactor this method!
-Any SAL_CALL Cell::getFastPropertyValue( sal_Int32 nHandle ) throw
(UnknownPropertyException, WrappedTargetException, RuntimeException)
-{
-(void)nHandle;
-throw UnknownPropertyException();
-}
-
-
// XText
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 82d717d..65fdcd0 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -111,11 +111,6 @@ public:
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence
::com::sun::star::uno::Type SAL_CALL getTypes( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence ::sal_Int8
SAL_CALL getImplementationId( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-// XServiceInfo
-SVX_DLLPRIVATE virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-SVX_DLLPRIVATE virtual sal_Bool SAL_CALL supportsService( const OUString
ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
-SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence OUString
SAL_CALL getSupportedServiceNames( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
// XLayoutConstrains
SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getMinimumSize()
throw (::com::sun::star::uno::RuntimeException,
@@ -167,10 +162,6 @@ public:
SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const
::com::sun::star::uno::Sequence OUString aPropertyNames ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence
::com::sun::star::uno::Any SAL_CALL getPropertyDefaults( const
::com::sun::star::uno::Sequence OUString aPropertyNames ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-// XFastPropertySet
-SVX_DLLPRIVATE virtual void SAL_CALL setFastPropertyValue( ::sal_Int32
nHandle, const ::com::sun::star::uno::Any aValue ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
-SVX_DLLPRIVATE virtual
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acctable.cxx |4 ++--
sw/source/core/crsr/crstrvl.cxx|2 +-
sw/source/filter/html/htmltab.cxx |3 ++-
sw/source/uibase/inc/num.hxx |4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 3da32e1fd23aec2f6b7629a318468ecf0179f8cd
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 08:46:47 2014 +0200
Fix some warnings
Change-Id: Ib661af2ab2ad2e95890edb1edf979a82e67a9443
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 14eeb46..08877d3 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1438,8 +1438,8 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const
SwAccessibleChild rChil
if( HasTableData() )
{
-OSL_ENSURE( !HasTableData() ||
-GetFrm()-Frm().Pos() == GetTableData().GetTablePos(),
+SAL_WARN_IF( HasTableData()
+GetFrm()-Frm().Pos() != GetTableData().GetTablePos(),
sw.core,
table has invalid position );
if( HasTableData() )
{
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 80febe1..9925e1e 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1447,7 +1447,7 @@ bool SwCrsrShell::GetContentAtPos( const Point rPt,
RES_BOXATR_VALUE, false, pItem ))
#else
SFX_ITEM_SET == pBox-GetFrmFmt()-GetItemState(
-RES_BOXATR_FORMULA, sal_False, pItem )
+RES_BOXATR_FORMULA, false, pItem )
#endif
)
{
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 4aa9650..ddba2af 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2999,8 +2999,9 @@ public:
_SectionSaveStruct( SwHTMLParser rParser );
virtual ~_SectionSaveStruct();
+#if OSL_DEBUG_LEVEL 0
sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMinSave; }
-
+#endif
void Restore( SwHTMLParser rParser );
};
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 57ea8f1..6b5b251 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -132,8 +132,8 @@ public:
#ifdef DBG_UTIL
voidSetModified(bool bRepaint = true);
#else
-voidSetModified(sal_Bool bRepaint = sal_True)
-{ bModified = sal_True;
+voidSetModified(bool bRepaint = true)
+{ bModified = true;
if(bRepaint)
{
m_pPreviewWIN-SetLevel(nActNumLvl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdoashp.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 164ec65b1afbd781486122e5c1137303067564cc
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Jun 20 21:48:02 2014 +0200
Let's make this more consistent / readable.
Change-Id: I6a14c658961ce6de271c34e478d797de2bdbbc78
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a640b22..8205121 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -621,9 +621,9 @@ std::vector SdrCustomShapeInteraction
SdrObjCustomShape::GetInteractionHandle
{
case mso_sptAccentBorderCallout90 : // 2 ortho
{
-if ( !i )
+if (i == 0)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_FIXED |
CUSTOMSHAPE_HANDLE_CREATE_FIXED;
-else if ( i == 1)
+else if (i == 1)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_X
| CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_Y | CUSTOMSHAPE_HANDLE_MOVE_SHAPE |
CUSTOMSHAPE_HANDLE_ORTHO4;
}
break;
@@ -633,24 +633,24 @@ std::vector SdrCustomShapeInteraction
SdrObjCustomShape::GetInteractionHandle
case mso_sptCloudCallout :
case mso_sptWedgeEllipseCallout :
{
-if ( !i )
+if (i == 0)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_FIXED;
}
break;
case mso_sptBorderCallout1 :// 2 diag
{
-if ( !i )
+if (i == 0)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_FIXED |
CUSTOMSHAPE_HANDLE_CREATE_FIXED;
-else if ( i == 1 )
+else if (i == 1)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_X
| CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_Y | CUSTOMSHAPE_HANDLE_MOVE_SHAPE;
}
break;
case mso_sptBorderCallout2 :// 3
{
-if ( !i )
+if (i == 0)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_FIXED |
CUSTOMSHAPE_HANDLE_CREATE_FIXED;
-else if ( i == 2 )
+else if (i == 2)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_X
| CUSTOMSHAPE_HANDLE_RESIZE_ABSOLUTE_Y | CUSTOMSHAPE_HANDLE_MOVE_SHAPE;
}
break;
@@ -668,7 +668,7 @@ std::vector SdrCustomShapeInteraction
SdrObjCustomShape::GetInteractionHandle
case mso_sptAccentBorderCallout2 :
case mso_sptAccentBorderCallout3 :
{
-if ( !i )
+if (i == 0)
nMode |= CUSTOMSHAPE_HANDLE_RESIZE_FIXED |
CUSTOMSHAPE_HANDLE_CREATE_FIXED;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - sw/inc sw/source writerfilter/source
sw/inc/pagedesc.hxx |1 +
sw/source/core/doc/docdesc.cxx|2 +-
sw/source/core/unocore/unostyle.cxx | 18 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |6 +++---
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 +-
5 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 7d32ac663e7ac4c6f3f22d003c3f36437be43399
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Jun 20 13:50:32 2014 +0100
fdo#76260 - Switch from vector to std::stack.
std::stack uses std::deque which is extremely expensive for this case.
This change saves 43bn of 98bn cycles spent in createFastChildContext.
Change-Id: I63919a9826563171f128e09d7206ac6cfdde336f
(cherry picked from commit 295b97b2a654e00ac5a8e6a3545284fa583fce78)
Signed-off-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1a436ce..7fd973c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -181,7 +181,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
m_bDiscardChildren = false;
aState.m_bTookChoice = m_bTookChoice;
m_bTookChoice = false;
-m_aSavedAlternateStates.push(aState);
+m_aSavedAlternateStates.push_back(aState);
}
break;
case OOXML_Choice:
@@ -268,8 +268,8 @@ throw (uno::RuntimeException, xml::sax::SAXException,
std::exception)
m_bDiscardChildren = false;
else if (Element == (NS_mce | OOXML_AlternateContent))
{
-SavedAlternateState aState(m_aSavedAlternateStates.top());
-m_aSavedAlternateStates.pop();
+SavedAlternateState aState(m_aSavedAlternateStates.back());
+m_aSavedAlternateStates.pop_back();
m_bDiscardChildren = aState.m_bDiscardChildren;
m_bTookChoice = aState.m_bTookChoice;
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index f8f2638..a7d9bfa 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -300,7 +300,7 @@ private:
uno::Reference uno::XComponentContext m_xContext;
bool m_bDiscardChildren;
bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
-std::stackSavedAlternateState m_aSavedAlternateStates;
+std::vectorSavedAlternateState m_aSavedAlternateStates;
static sal_uInt32 mnInstanceCount;
commit 22c818bd9fa79a2c008719cc0a858ba2a74b0d82
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Jun 19 22:34:55 2014 +0100
fdo#76260 - a better approach for getting element names.
Don't do lots more work than we need to to build the list of names.
It appears that the [] operator does a lot of apparently un-necessary
work.
(cherry picked from commit 9e5e9dd1b276043d2e9f45c01d72b2e89d8abdf2)
Signed-off-by: Miklos Vajna vmik...@collabora.co.uk
Conflicts:
sw/source/core/unocore/unostyle.cxx
Change-Id: Id603fb4e717dc7130468465493edccfe51d384c7
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 15a4639..ae28998 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -69,6 +69,7 @@
#include comphelper/servicehelper.hxx
#include cppuhelper/supportsservice.hxx
+#include comphelper/sequenceasvector.hxx
//
#include unobrushitemhelper.hxx
@@ -787,23 +788,22 @@ uno::Any SwXStyleFamily::getByName(const OUString rName)
uno::Sequence OUString SwXStyleFamily::getElementNames(void) throw(
uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
-uno::Sequence OUString aRet;
+comphelper::SequenceAsVector OUString aRet;
if(pBasePool)
{
-SfxStyleSheetIteratorPtr pIterator =
pBasePool-CreateIterator(eFamily, SFXSTYLEBIT_ALL);
-sal_uInt16 nCount = pIterator-Count();
-aRet.realloc(nCount);
-OUString* pArray = aRet.getArray();
+SfxStyleSheetIteratorPtr pIt = pBasePool-CreateIterator(eFamily,
SFXSTYLEBIT_ALL);
OUString aString;
-for(sal_uInt16 i = 0; i nCount; i++)
+for (SfxStyleSheetBase* pStyle = pIt-First(); pStyle; pStyle =
pIt-Next())
{
-SwStyleNameMapper::FillProgName((*pIterator)[i]-GetName(),
aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
-pArray[i] = aString;
+SwStyleNameMapper::FillProgName(pStyle-GetName(), aString,
+lcl_GetSwEnumFromSfxEnum ( eFamily
), true);
+aRet.push_back(aString);
[Libreoffice-commits] core.git: dbaccess/uiconfig
dbaccess/uiconfig/ui/relationdialog.ui |3 --- 1 file changed, 3 deletions(-) New commits: commit 012003e4681736083f6d3f987a69011ef0200ddc Author: David Tardon dtar...@redhat.com Date: Tue Jun 24 09:51:09 2014 +0200 fdo#80422 check only one radio button in a group Change-Id: Ibf1ed3d33d8b2c7da4eee26943da0c09647f4bff diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui index 053fe77..6deada1 100644 --- a/dbaccess/uiconfig/ui/relationdialog.ui +++ b/dbaccess/uiconfig/ui/relationdialog.ui @@ -352,7 +352,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing @@ -370,7 +369,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing @@ -388,7 +386,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74314, which changed state. Bug 74314 Summary: [UI] Impress: no sound listed in gallery for animation or transition if you add language pack https://bugs.freedesktop.org/show_bug.cgi?id=74314 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/core/stlpool.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 75f191b09f25e4dd357f42fdf80c2b0252d1c410
Author: Steve Yin stev...@apache.org
Date: Tue Jun 24 06:43:14 2014 +
Issue 125090 - The values of upper and lower spacing for default paragraph
did the complete opposite.
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 1e3a1e5..06f9259 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -264,14 +264,14 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
String rLayoutName, sal_Bo
sal_uLong nFontSize = 20;
short nFirstIndent = -600;
// sal_uInt16 nIndent = nLevel * 1200;
-sal_uInt16 nLower = 100;
+sal_uInt16 nUpper = 100;
switch (nLevel)
{
case 1:
{
nFontSize = 32;
-nLower = 500;
+nUpper = 500;
nFirstIndent = -900;
}
break;
@@ -279,7 +279,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
String rLayoutName, sal_Bo
case 2:
{
nFontSize = 28;
-nLower = 400;
+nUpper = 400;
nFirstIndent = -800;
}
break;
@@ -287,13 +287,13 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
String rLayoutName, sal_Bo
case 3:
{
nFontSize = 24;
-nLower = 300;
+nUpper = 300;
}
break;
case 4:
{
-nLower = 200;
+nUpper = 200;
}
break;
}
@@ -314,7 +314,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
String rLayoutName, sal_Bo
pSheet-GetItemSet().Put(aSvxLRSpaceItem);
*/
// Zeilendurchschuss (Abstand nach unten)
-aSvxULSpaceItem.SetLower(nLower);
+aSvxULSpaceItem.SetUpper(nUpper);
pSheet-GetItemSet().Put(aSvxULSpaceItem);
/* i35937
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |9 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 13 -
writerfilter/source/ooxml/OOXMLParserState.hxx| 15 +++
3 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 95e6cc2ecbcb653f76c4a1ee109908a12b84e456
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 24 10:25:47 2014 +0200
Related: fdo#76260 writerfilter: move SavedAlternateStates to
OOXMLParserState
Change-Id: Ib9bddeb2d3b5ccdb71295587acbd13c86e5dd28b
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index b89a5cf..4214380 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -150,8 +150,7 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
inPositionV(pContext-inPositionV),
m_xContext(pContext-m_xContext),
m_bDiscardChildren(pContext-m_bDiscardChildren),
- m_bTookChoice(pContext-m_bTookChoice),
- m_aSavedAlternateStates(pContext-m_aSavedAlternateStates)
+ m_bTookChoice(pContext-m_bTookChoice)
{
mpParserState = pContext-mpParserState;
@@ -179,7 +178,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
m_bDiscardChildren = false;
aState.m_bTookChoice = m_bTookChoice;
m_bTookChoice = false;
-m_aSavedAlternateStates.push_back(aState);
+mpParserState-getSavedAlternateStates().push_back(aState);
}
break;
case OOXML_Choice:
@@ -241,8 +240,8 @@ throw (uno::RuntimeException, xml::sax::SAXException,
std::exception)
m_bDiscardChildren = false;
else if (Element == (NS_mce | OOXML_AlternateContent))
{
-SavedAlternateState aState(m_aSavedAlternateStates.back());
-m_aSavedAlternateStates.pop_back();
+SavedAlternateState
aState(mpParserState-getSavedAlternateStates().back());
+mpParserState-getSavedAlternateStates().pop_back();
m_bDiscardChildren = aState.m_bDiscardChildren;
m_bTookChoice = aState.m_bTookChoice;
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 88b1b80..eb315cf 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -43,18 +43,6 @@ namespace ooxml
typedef boost::shared_ptrStream StreamPointer_t;
-/**
- * Struct to store our 'alternate state'. If multiple mc:AlternateContent
- * elements arrive, then while the inner ones are active, the original state is
- * saved away, and once they inner goes out of scope, the original state is
- * restored.
- */
-struct SavedAlternateState
-{
-bool m_bDiscardChildren;
-bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
-};
-
class OOXMLFastContextHandler:
public ::cppu::WeakImplHelper1
xml::sax::XFastContextHandler
@@ -290,7 +278,6 @@ private:
uno::Reference uno::XComponentContext m_xContext;
bool m_bDiscardChildren;
bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
-std::vectorSavedAlternateState m_aSavedAlternateStates;
static sal_uInt32 mnInstanceCount;
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx
b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 0cafc11..935ee52 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -31,6 +31,18 @@ namespace writerfilter {
namespace ooxml
{
+/**
+ * Struct to store our 'alternate state'. If multiple mc:AlternateContent
+ * elements arrive, then while the inner ones are active, the original state is
+ * saved away, and once they inner goes out of scope, the original state is
+ * restored.
+ */
+struct SavedAlternateState
+{
+bool m_bDiscardChildren;
+bool m_bTookChoice; /// Did we take the Choice or want Fallback instead?
+};
+
class OOXMLParserState
{
bool mbInSectionGroup;
@@ -51,6 +63,7 @@ class OOXMLParserState
bool savedInParagraphGroup;
bool savedInCharacterGroup;
bool savedLastParagraphInSection;
+std::vectorSavedAlternateState maSavedAlternateStates;
public:
typedef boost::shared_ptrOOXMLParserState Pointer_t;
@@ -64,6 +77,8 @@ public:
void setLastParagraphInSection(bool bLastParagraphInSection);
bool isLastParagraphInSection() const { return mbLastParagraphInSection;}
+std::vectorSavedAlternateState getSavedAlternateStates() { return
maSavedAlternateStates; }
+
bool isInParagraphGroup() const { return mbInParagraphGroup;}
void setInParagraphGroup(bool bInParagraphGroup);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dbaccess/uiconfig
dbaccess/uiconfig/ui/relationdialog.ui |3 --- 1 file changed, 3 deletions(-) New commits: commit 6807a4f6903b155d2d7415cc665d6063641ac53e Author: David Tardon dtar...@redhat.com Date: Tue Jun 24 09:51:09 2014 +0200 fdo#80422 check only one radio button in a group Change-Id: Ibf1ed3d33d8b2c7da4eee26943da0c09647f4bff (cherry picked from commit 012003e4681736083f6d3f987a69011ef0200ddc) Reviewed-on: https://gerrit.libreoffice.org/9872 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui index 511bdb9..c88f21d 100644 --- a/dbaccess/uiconfig/ui/relationdialog.ui +++ b/dbaccess/uiconfig/ui/relationdialog.ui @@ -352,7 +352,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing @@ -370,7 +369,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing @@ -388,7 +386,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=xalign0/property -property name=activeTrue/property property name=draw_indicatorTrue/property /object packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/transparencytabpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f8046a2e52312458c400b34fca36013c53c8f2c Author: Joel jmadero@gmail.com Date: Mon Jun 23 11:48:36 2014 -0700 fdo#80373 Updated label to read Image background transparency Currently the transparency tab only covers image background transparency. Updated label so that users know that this tab has no impact on the transparency of the image itself. Conflicts: cui/uiconfig/ui/transparencytabpage.ui Change-Id: Ib488974b0965ee54288092b1e9ca2dc4c040547c diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui index a097a37..be6b46f 100644 --- a/cui/uiconfig/ui/transparencytabpage.ui +++ b/cui/uiconfig/ui/transparencytabpage.ui @@ -499,7 +499,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesTransparency Mode/property +property name=label translatable=yesImage background transparency/property attributes attribute name=weight value=bold/ /attributes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx |2 +-
dbaccess/source/ui/dlg/DbAdminImpl.cxx |2 +-
dbaccess/source/ui/dlg/advancedsettings.hxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3d768a21582337ab8491b9cc3192c77c89a075b4
Author: Luc Castermans luc.casterm...@gmail.com
Date: Mon Jun 9 09:46:45 2014 +0200
Translated German comments
Change-Id: I1a40351aec666c94707ad2dd625f3ab8606242d1
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index a7b707f..13d6dbf 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -69,7 +69,7 @@ namespace dbaui
protected:
OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const
SfxItemSet _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId,
sal_uInt16 _nUrlResId);
virtual bool checkTestConnection() SAL_OVERRIDE;
-// nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
+// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~OConnectionTabPageSetup();
};
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index ccfb06a..5387c63 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -229,7 +229,7 @@ bool
ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence PropertyVal
// check if the connection type requires a password
if (hasAuthentication(*m_pItemSetHelper-getOutputSet()))
{
-// password: DSID_PASSWORD - password
+// password: DSID_PASSWORD - password
SFX_ITEMSET_GET(*m_pItemSetHelper-getOutputSet(), pPassword,
SfxStringItem, DSID_PASSWORD, true);
OUString sPassword = pPassword ? pPassword-GetValue() : OUString();
SFX_ITEMSET_GET(*m_pItemSetHelper-getOutputSet(), pPasswordRequired,
SfxBoolItem, DSID_PASSWORDREQUIRED, true);
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx
b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 543d82a..74effcf 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -113,7 +113,7 @@ namespace dbaui
GeneratedValuesPage( Window* pParent, const SfxItemSet _rCoreAttrs );
protected:
-// nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
+// nControlFlags os a combination of the CBTP_xxx-constants
virtual ~GeneratedValuesPage();
// must be overloaded by subclasses, but it isn't pure virtual
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/advancedsettings.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f910280b8704ed9c289150a4ca3c8d60e15d0d97 Author: Luc Castermans luc.casterm...@gmail.com Date: Mon Jun 9 09:46:45 2014 +0200 Translated German comments - correction Conflicts: dbaccess/source/ui/dlg/advancedsettings.hxx Change-Id: If1bbd9ce099f1e8e70149277b412db54f28cb0de Reviewed-on: https://gerrit.libreoffice.org/9802 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 74effcf..ff28557 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -113,7 +113,7 @@ namespace dbaui GeneratedValuesPage( Window* pParent, const SfxItemSet _rCoreAttrs ); protected: -// nControlFlags os a combination of the CBTP_xxx-constants +// nControlFlags is a combination of the CBTP_xxx-constants virtual ~GeneratedValuesPage(); // must be overloaded by subclasses, but it isn't pure virtual ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source
svx/source/table/cell.cxx | 14 +-
svx/source/table/cell.hxx |1 -
svx/source/table/tablelayouter.cxx |8
3 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 6fc729682d4713c45729a88fe323b3ac7a341fdd
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jun 23 19:20:07 2014 +0200
Related bnc#822625: Minimum height was not invalidated when rectangle
changes.
5792e76cb5beb630c135f57b74f57d74dd2dc2b0 was too optimistic and did not
invalidate mnCachedMinHeight often enough.
This was resulting in a grey area below table frame when resizing it.
So, revert 5792e76cb5beb630c135f57b74f57d74dd2dc2b0
Related bnc#822625: Cache minimum height for table cells.
and istead just use getMinimumWidth() in TableLayouter if that's all we
need.
getMinimumHeight() is expensive.
Change-Id: I34c49dda75d6aa5b4d3746114352621a40dd
(cherry picked from commit b8f7ea5da41d61d405adec54dcd10b54ee0e5591)
Reviewed-on: https://gerrit.libreoffice.org/9870
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index e0f85c2..3ab9b68 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -359,7 +359,6 @@ Cell::Cell( SdrTableObj rTableObj, OutlinerParaObject*
pOutlinerParaObject ) th
, mbMerged( false )
, mnRowSpan( 1 )
, mnColSpan( 1 )
-, mnCachedMinHeight( -1 )
, mxTable( rTableObj.getTable() )
{
if( rTableObj.GetModel() )
@@ -526,7 +525,6 @@ void Cell::setMerged()
void Cell::notifyModified()
{
-mnCachedMinHeight = -1;
if( mxTable.is() )
mxTable-setModified( sal_True );
}
@@ -683,10 +681,8 @@ sal_Int32 Cell::getMinimumHeight()
if( !mpProperties )
return 0;
-if( mnCachedMinHeight != -1 )
-return mnCachedMinHeight;
-
SdrTableObj rTableObj = dynamic_cast SdrTableObj ( GetObject() );
+sal_Int32 nMinimumHeight = 0;
Rectangle aTextRect;
TakeTextAnchorRect( aTextRect );
@@ -697,7 +693,7 @@ sal_Int32 Cell::getMinimumHeight()
if(pEditOutliner)
{
pEditOutliner-SetMaxAutoPaperSize(aSize);
-mnCachedMinHeight = pEditOutliner-GetTextHeight()+1;
+nMinimumHeight = pEditOutliner-GetTextHeight()+1;
}
else /*if ( hasText() )*/
{
@@ -710,12 +706,12 @@ sal_Int32 Cell::getMinimumHeight()
{
rOutliner.SetText(*GetOutlinerParaObject());
}
-mnCachedMinHeight=rOutliner.GetTextHeight()+1;
+nMinimumHeight=rOutliner.GetTextHeight()+1;
rOutliner.Clear();
}
-mnCachedMinHeight += GetTextUpperDistance() + GetTextLowerDistance();
-return mnCachedMinHeight;
+nMinimumHeight += GetTextUpperDistance() + GetTextLowerDistance();
+return nMinimumHeight;
}
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 2927a87..c5a0078 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -226,7 +226,6 @@ private:
bool mbMerged;
::sal_Int32 mnRowSpan;
::sal_Int32 mnColSpan;
-::sal_Int32 mnCachedMinHeight;
Rectangle maCellRect;
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 7f4651d..b3743eb 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -554,7 +554,7 @@ void TableLayouter::LayoutTableWidth( Rectangle rArea,
bool bFit )
}
else
{
-nMinWidth = std::max( nMinWidth,
xCell-getMinimumSize().Width );
+nMinWidth = std::max( nMinWidth, xCell-getMinimumWidth()
);
}
}
}
@@ -620,7 +620,7 @@ void TableLayouter::LayoutTableWidth( Rectangle rArea,
bool bFit )
while( iter != aMergedCells[nCol].end() )
{
CellRef xCell( (*iter++) );
-sal_Int32 nMinWidth = xCell-getMinimumSize().Width;
+sal_Int32 nMinWidth = xCell-getMinimumWidth();
for( sal_Int32 nMCol = nCol - xCell-getColumnSpan() + 1; (nMCol
0) (nMCol nCol); ++nMCol )
nMinWidth -= maColumns[nMCol].mnSize;
@@ -704,7 +704,7 @@ void TableLayouter::LayoutTableHeight( Rectangle rArea,
bool bFit )
}
else
{
-nMinHeight = std::max( nMinHeight,
xCell-getMinimumSize().Height );
+nMinHeight = std::max( nMinHeight,
xCell-getMinimumHeight() );
}
}
}
@@ -771,7 +771,7 @@ void TableLayouter::LayoutTableHeight( Rectangle rArea,
bool bFit )
while( iter != aMergedCells[nRow].end() )
{
CellRef xCell( (*iter++) );
-sal_Int32 nMinHeight = xCell-getMinimumSize().Height;
+sal_Int32 nMinHeight = xCell-getMinimumHeight();
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/table/cell.cxx | 14 +-
svx/source/table/cell.hxx |1 -
svx/source/table/tablelayouter.cxx |8
3 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit a64eda5c5f754b7534d2d62ac9a1f13165621533
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jun 23 19:20:07 2014 +0200
Related bnc#822625: Minimum height was not invalidated when rectangle
changes.
5792e76cb5beb630c135f57b74f57d74dd2dc2b0 was too optimistic and did not
invalidate mnCachedMinHeight often enough.
This was resulting in a grey area below table frame when resizing it.
So, revert 5792e76cb5beb630c135f57b74f57d74dd2dc2b0
Related bnc#822625: Cache minimum height for table cells.
and istead just use getMinimumWidth() in TableLayouter if that's all we
need.
getMinimumHeight() is expensive.
Change-Id: I34c49dda75d6aa5b4d3746114352621a40dd
(cherry picked from commit b8f7ea5da41d61d405adec54dcd10b54ee0e5591)
Reviewed-on: https://gerrit.libreoffice.org/9871
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 7e04db7..d4f199b 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -358,7 +358,6 @@ Cell::Cell( SdrTableObj rTableObj, OutlinerParaObject*
pOutlinerParaObject ) th
, mbMerged( sal_False )
, mnRowSpan( 1 )
, mnColSpan( 1 )
-, mnCachedMinHeight( -1 )
, mxTable( rTableObj.getTable() )
{
if( rTableObj.GetModel() )
@@ -525,7 +524,6 @@ void Cell::setMerged()
void Cell::notifyModified()
{
-mnCachedMinHeight = -1;
if( mxTable.is() )
mxTable-setModified( sal_True );
}
@@ -682,10 +680,8 @@ sal_Int32 Cell::getMinimumHeight()
if( !mpProperties )
return 0;
-if( mnCachedMinHeight != -1 )
-return mnCachedMinHeight;
-
SdrTableObj rTableObj = dynamic_cast SdrTableObj ( GetObject() );
+sal_Int32 nMinimumHeight = 0;
Rectangle aTextRect;
TakeTextAnchorRect( aTextRect );
@@ -696,7 +692,7 @@ sal_Int32 Cell::getMinimumHeight()
if(pEditOutliner)
{
pEditOutliner-SetMaxAutoPaperSize(aSize);
-mnCachedMinHeight = pEditOutliner-GetTextHeight()+1;
+nMinimumHeight = pEditOutliner-GetTextHeight()+1;
}
else /*if ( hasText() )*/
{
@@ -709,12 +705,12 @@ sal_Int32 Cell::getMinimumHeight()
{
rOutliner.SetText(*GetOutlinerParaObject());
}
-mnCachedMinHeight=rOutliner.GetTextHeight()+1;
+nMinimumHeight=rOutliner.GetTextHeight()+1;
rOutliner.Clear();
}
-mnCachedMinHeight += GetTextUpperDistance() + GetTextLowerDistance();
-return mnCachedMinHeight;
+nMinimumHeight += GetTextUpperDistance() + GetTextLowerDistance();
+return nMinimumHeight;
}
//
-
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index ba2c6f6..1b26b1c 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -222,7 +222,6 @@ private:
::sal_Bool mbMerged;
::sal_Int32 mnRowSpan;
::sal_Int32 mnColSpan;
-::sal_Int32 mnCachedMinHeight;
Rectangle maCellRect;
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 55ed2d2..2b97996 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -556,7 +556,7 @@ void TableLayouter::LayoutTableWidth( Rectangle rArea,
bool bFit )
}
else
{
-nMinWidth = std::max( nMinWidth,
xCell-getMinimumSize().Width );
+nMinWidth = std::max( nMinWidth, xCell-getMinimumWidth()
);
}
}
}
@@ -622,7 +622,7 @@ void TableLayouter::LayoutTableWidth( Rectangle rArea,
bool bFit )
while( iter != aMergedCells[nCol].end() )
{
CellRef xCell( (*iter++) );
-sal_Int32 nMinWidth = xCell-getMinimumSize().Width;
+sal_Int32 nMinWidth = xCell-getMinimumWidth();
for( sal_Int32 nMCol = nCol - xCell-getColumnSpan() + 1; (nMCol
0) (nMCol nCol); ++nMCol )
nMinWidth -= maColumns[nMCol].mnSize;
@@ -706,7 +706,7 @@ void TableLayouter::LayoutTableHeight( Rectangle rArea,
bool bFit )
}
else
{
-nMinHeight = std::max( nMinHeight,
xCell-getMinimumSize().Height );
+nMinHeight = std::max( nMinHeight,
xCell-getMinimumHeight() );
}
}
}
@@ -773,7 +773,7 @@ void TableLayouter::LayoutTableHeight( Rectangle rArea,
bool bFit )
while( iter != aMergedCells[nRow].end() )
{
CellRef xCell( (*iter++) );
-sal_Int32 nMinHeight =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b4/c9dd86123180e7ca5ffade6cc5d41ce54c7885
b4/c9dd86123180e7ca5ffade6cc5d41ce54c7885 |1 + 1 file changed, 1 insertion(+) New commits: commit 2eaed816166aa22562282fc685612cd070edb45f Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 24 10:44:43 2014 +0100 Notes added by 'git notes add' diff --git a/b4/c9dd86123180e7ca5ffade6cc5d41ce54c7885 b/b4/c9dd86123180e7ca5ffade6cc5d41ce54c7885 new file mode 100644 index 000..625b63b --- /dev/null +++ b/b4/c9dd86123180e7ca5ffade6cc5d41ce54c7885 @@ -0,0 +1 @@ +prefer: 08c475bb24a34f3a6a3f08e8490b521e8dcc96be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/formcontroller.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f8115ce72dad45b82b044d9c8f5c253d0514574d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 24 11:40:23 2014 +0200
fdo#75339: Substituting XInterface* eq. for object eq. requires
queryInterface
Regression introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 Use
the new
type-checking Reference constructor to reduce code noise which should have
left
(at least some) querying upcasts to XInterface alone. Closer inspection
of
that commit will probably turn up further regressions that need to be
reverted.
Change-Id: Ib81afc12d9df205b5b0fe6cec6ce85d012e9629f
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index 171da47..6660be4 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -354,6 +354,8 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
lcl_resetColumnControlInfo( *col );
+Reference XInterface xNormColumn( col-xColumn, UNO_QUERY_THROW
);
+
const Reference XControl * pControl( _rControls.getConstArray()
);
const Reference XControl * pControlEnd( pControl +
_rControls.getLength() );
for ( ; pControl != pControlEnd; ++pControl )
@@ -375,7 +377,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
{
Reference XPropertySet xGridColumnModel(
xGridColAccess-getByIndex( gridCol ), UNO_QUERY_THROW );
-if ( !lcl_isBoundTo( xGridColumnModel, col-xColumn
)
+if ( !lcl_isBoundTo( xGridColumnModel, xNormColumn )
|| !lcl_isInputRequired( xGridColumnModel )
)
continue; // with next grid column
@@ -395,7 +397,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
}
if ( !xModelPSI-hasPropertyByName( FM_PROP_BOUNDFIELD )
-|| !lcl_isBoundTo( xModel, col-xColumn )
+|| !lcl_isBoundTo( xModel, xNormColumn )
|| !lcl_isInputRequired( xModel )
)
continue; // with next control
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/stlpool.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 229b8f91228e195fa2613486447c02260c5844e5
Author: Steve Yin stev...@apache.org
Date: Tue Jun 24 06:43:14 2014 +
Resolves: #i125090# The values of upper and lower spacing...
for default paragraph did the complete opposite.
(cherry picked from commit 75f191b09f25e4dd357f42fdf80c2b0252d1c410)
Conflicts:
sd/source/core/stlpool.cxx
Change-Id: Idd44f7f1e4ad6acbde2733240fd357e628ac1f28
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index da88e23..cb81501 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -274,34 +274,34 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString rLayoutName, bool
}
sal_uLong nFontSize = 20;
-sal_uInt16 nLower = 100;
+sal_uInt16 nUpper = 100;
switch (nLevel)
{
case 1:
{
nFontSize = 32;
-nLower = 500;
+nUpper = 500;
}
break;
case 2:
{
nFontSize = 28;
-nLower = 400;
+nUpper = 400;
}
break;
case 3:
{
nFontSize = 24;
-nLower = 300;
+nUpper = 300;
}
break;
case 4:
{
-nLower = 200;
+nUpper = 200;
}
break;
}
@@ -313,8 +313,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
OUString rLayoutName, bool
rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100,
EE_CHAR_FONTHEIGHT_CJK ) );
rOutlineSet.Put( SvxFontHeightItem(
SdDrawDocument::convertFontHeightToCTL( nFontSize ), 100,
EE_CHAR_FONTHEIGHT_CTL ) );
-// Line distance (downwards). Stuff around here cleaned up in
i35937
-aSvxULSpaceItem.SetLower(nLower);
+// Line distance (upwards). Stuff around here cleaned up in i35937
+aSvxULSpaceItem.SetUpper(nUpper);
pSheet-GetItemSet().Put(aSvxULSpaceItem);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - l10ntools/source
l10ntools/source/export2.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit cb8f2e44c2772af90e7be12dfc8bbf167f31f56b
Author: Herbert Dürr h...@apache.org
Date: Tue Jun 24 09:48:21 2014 +
#i125143# reduce helpex stack usage to prevent intermittent failures
moving the 1MB copy buffer from the stack to the heap solves the problem
that was first observed on the Windows buildbot.
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 1608a09..fb9df40 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -36,6 +36,7 @@
#include tools/urlobj.hxx
#include time.h
#include stdlib.h
+#include boost/shared_ptr.hpp
using namespace std;
//
@@ -339,9 +340,6 @@ void Export::RemoveUTF8ByteOrderMarkerFromFile( const
ByteString rFilename ){
bool Export::CopyFile( const ByteString source , const ByteString dest )
{
//cout CopyFile( source.GetBuffer() , dest.GetBuffer()
)\n;
-static const int BUFFERSIZE = 0x10;
-char buf[ BUFFERSIZE ];
-
FILE* IN_FILE = fopen( source.GetBuffer() , r );
if( IN_FILE == NULL )
{
@@ -357,6 +355,10 @@ bool Export::CopyFile( const ByteString source , const
ByteString dest )
return false;
}
+static const int BUFFERSIZE = 0x10;
+boost::shared_ptrchar aScopedBuffer( new char[BUFFERSIZE] );
+char* buf = aScopedBuffer.get();
+
bool bOk = true;
while( bOk )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/returnbyref.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 466ee86cabe049ddaa873b831a895386162cb3aa
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 24 12:32:18 2014 +0200
Clang trunk compat fix
Change-Id: Ic414ad0416e27e223ff702996b796b68d39709b9
diff --git a/compilerplugins/clang/returnbyref.cxx
b/compilerplugins/clang/returnbyref.cxx
index a386b5d..b5f32ee 100644
--- a/compilerplugins/clang/returnbyref.cxx
+++ b/compilerplugins/clang/returnbyref.cxx
@@ -10,6 +10,7 @@
#include string
#include set
+#include compat.hxx
#include plugin.hxx
// Find places where we are returning a pointer to something, where we can be
returning a reference.
@@ -56,7 +57,7 @@ bool ReturnByRef::VisitCXXMethodDecl(const CXXMethodDecl *
functionDecl) {
functionDecl-getCanonicalDecl()-getNameInfo().getLoc( {
return true;
}
-QualType t1 { functionDecl-getResultType() };
+QualType t1 { compat::getReturnType(*functionDecl) };
if (!t1-isPointerType()) {
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx | 33 +
sw/source/core/inc/UndoManager.hxx |3 +++
2 files changed, 36 insertions(+)
New commits:
commit be57d41dc64acc47611fdb59568b25500ad5c690
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 24 11:33:59 2014 +0200
Add sw::UndoManager::dumpAsXml()
So that it's easy to see where the implementation for a given undo
action is.
Change-Id: I652826d2933451b84a05eecc3982c8cbf2db3764
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 3c1b3c1..df9a8fb 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -10,6 +10,7 @@
#include doc.hxx
#include drawdoc.hxx
#include IDocumentDrawModelAccess.hxx
+#include UndoManager.hxx
#include ndtxt.hxx
#include MarkManager.hxx
#include docary.hxx
@@ -178,6 +179,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w )
writer.writeFormatAttribute( ptr, %p, this );
m_pNodes-dumpAsXml( writer );
mpMarkManager-dumpAsXml( writer );
+m_pUndoManager-dumpAsXml(writer);
mpFldTypes-dumpAsXml( writer );
mpTxtFmtCollTbl-dumpAsXml( writer );
mpCharFmtTbl-dumpAsXml( writer );
@@ -918,4 +920,35 @@ void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
writer.endElement( );// swextraredlinetbl
}
+void lcl_dumpSfxUndoAction(WriterHelper writer, SfxUndoAction* pAction)
+{
+writer.startElement(undoAction);
+writer.writeFormatAttribute(symbol, %s,
BAD_CAST(typeid(*pAction).name()));
+writer.writeFormatAttribute(comment, %s,
BAD_CAST(OUStringToOString(pAction-GetComment(),
RTL_TEXTENCODING_UTF8).getStr()));
+
+if (SfxListUndoAction* pList = dynamic_castSfxListUndoAction*(pAction))
+{
+writer.startElement(list);
+writer.writeFormatAttribute(size, TMP_FORMAT,
pList-aUndoActions.size());
+for (size_t i = 0; i pList-aUndoActions.size(); ++i)
+lcl_dumpSfxUndoAction(writer, pList-aUndoActions[i].pAction);
+writer.endElement();
+}
+
+writer.endElement();
+}
+
+void sw::UndoManager::dumpAsXml(xmlTextWriterPtr w)
+{
+WriterHelper writer(w);
+
+writer.startElement(m_pUndoManager);
+writer.writeFormatAttribute(nUndoActionCount, TMP_FORMAT,
GetUndoActionCount());
+
+for (size_t i = 0; i GetUndoActionCount(); ++i)
+lcl_dumpSfxUndoAction(writer, GetUndoAction(i));
+
+writer.endElement();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoManager.hxx
b/sw/source/core/inc/UndoManager.hxx
index 65d3b03..43c5995 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -23,6 +23,7 @@
#include IDocumentUndoRedo.hxx
#include boost/shared_ptr.hpp
#include svx/sdrundomanager.hxx
+#include ndarr.hxx
class IDocumentDrawModelAccess;
class IDocumentRedlineAccess;
@@ -84,6 +85,8 @@ public:
SwNodes const GetUndoNodes() const;
SwNodes GetUndoNodes();
+void dumpAsXml(xmlTextWriterPtr w);
+
private:
IDocumentDrawModelAccess m_rDrawModelAccess;
IDocumentRedlineAccess m_rRedlineAccess;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Adding KACST font to libreoffice
On Tue, 2014-06-10 at 18:38 +, Faisal M. Alotaibi wrote: Hi all, we want to add KACST font to LibreOffice, and become a default font for Arabic. These are two different things really. Changing the default font for Arabic as one, and bundling it as another. IMO changing the default font is fairly easy and not troublesome, so add the entry in to the VCL.xcu at the start of the list for the affected languages. So if it's ok to add it The bundling is a potential pain, in the sense that we don't have any sort of policy about bundling fonts and I'm always a little worried that we'll end up with multiple gigs of font files bundled into LibreOffice to support a gadzillion languages. So, a while back I made an effort of a list of the top 10 most written languages at the top of this configuration file http://cgit.freedesktop.org/libreoffice/libexttextcat/tree/langclass/fpdb.conf So I suggest a starting policy that bundling fonts for the big ten is ok and non-contentious, and Arabic is of course in that list, so bundling the Kacst fonts would be fine. what we need to do to the fonts before added to libreoffice? Suitably licensed I suppose for a start, what is the license for the fonts ? Technically then it's follow the examples in external/more_fonts C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/distro-install-file-lists
bin/distro-install-file-lists |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5406e237ea2ec534988da31104f10188b001ad75 Author: Tomáš Chvátal tchva...@suse.cz Date: Tue Jun 24 09:55:29 2014 +0200 Package filter in common pack Change-Id: I3728244712966cf2245a79f2630ac46cb63f1d21 diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index ada7295..87c2a09 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -78,6 +78,7 @@ if test z$OOO_VENDOR != zDebian ; then rm -f common_list.txt for module in gid_Module_Root gid_Module_Root_Brand \ gid_Module_Root_Files_[0-9] \ +gid_Module_Filter \ gid_Module_Root_Hack \ gid_Module_Oo_Linguistic \ gid_Module_Root_Extension_Dictionary_* \ @@ -405,6 +406,7 @@ else create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common +create_package_directory gid_Module_Filter pkg/libreoffice-common create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/inlinesimplememberfunctions.cxx | 34 +-
compilerplugins/clang/plugin.cxx | 23
compilerplugins/clang/plugin.hxx |5 ++
compilerplugins/clang/returnbyref.cxx | 32
compilerplugins/clang/store/salbool.cxx | 34 --
compilerplugins/clang/unreffun.cxx| 22 ---
6 files changed, 31 insertions(+), 119 deletions(-)
New commits:
commit a74193306a10a98902d192b8f7cecb92b4817c23
Author: Noel Grandin n...@peralex.com
Date: Tue Jun 24 12:47:28 2014 +0200
compilerplugins: move isUnoIncludeFile to base class
to reduce copy-pasted code
Change-Id: I7728d85dea7d0161998c326d6648ca681a8250d0
diff --git a/compilerplugins/clang/inlinesimplememberfunctions.cxx
b/compilerplugins/clang/inlinesimplememberfunctions.cxx
index 7fa43a4..42dd256 100644
--- a/compilerplugins/clang/inlinesimplememberfunctions.cxx
+++ b/compilerplugins/clang/inlinesimplememberfunctions.cxx
@@ -10,6 +10,7 @@
#include string
#include plugin.hxx
+#include compat.hxx
// Methods that purely return a local field should be declared in the header
and be declared inline.
// So that the compiler can elide the function call and turn it into a simple
fixed-offset-load instruction.
@@ -26,8 +27,6 @@ public:
bool VisitCXXMethodDecl(const CXXMethodDecl * decl);
private:
-bool isInUnoIncludeFile(SourceLocation spellingLocation) const;
-bool isInMainFile(SourceLocation spellingLocation) const;
bool rewrite(const CXXMethodDecl * functionDecl);
};
@@ -216,35 +215,6 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const
CXXMethodDecl * funct
return true;
}
-bool InlineSimpleMemberFunctions::isInUnoIncludeFile(SourceLocation
spellingLocation) const {
-StringRef name {
-compiler.getSourceManager().getFilename(spellingLocation) };
-return isInMainFile(spellingLocation)
-? (name == SRCDIR /cppu/source/cppu/compat.cxx
- || name == SRCDIR /cppuhelper/source/compat.cxx
- || name == SRCDIR /sal/osl/all/compat.cxx)
-: (name.startswith(SRCDIR /include/com/)
- || name.startswith(SRCDIR /include/cppu/)
- || name.startswith(SRCDIR /include/cppuhelper/)
- || name.startswith(SRCDIR /include/osl/)
- || name.startswith(SRCDIR /include/rtl/)
- || name.startswith(SRCDIR /include/sal/)
- || name.startswith(SRCDIR /include/salhelper/)
- || name.startswith(SRCDIR /include/systools/)
- || name.startswith(SRCDIR /include/typelib/)
- || name.startswith(SRCDIR /include/uno/)
- || name.startswith(SRCDIR /workdir/)
- || name == SRCDIR /include/comphelper/implbase_var.hxx);
-}
-
-bool InlineSimpleMemberFunctions::isInMainFile(SourceLocation
spellingLocation) const {
-#if (__clang_major__ == 3 __clang_minor__ = 4) || __clang_major__ 3
-return compiler.getSourceManager().isInMainFile(spellingLocation);
-#else
-return compiler.getSourceManager().isFromMainFile(spellingLocation);
-#endif
-}
-
static std::string ReplaceString(std::string subject, const std::string
search,
const std::string replace) {
size_t pos = 0;
@@ -264,7 +234,7 @@ bool InlineSimpleMemberFunctions::rewrite(const
CXXMethodDecl * functionDecl) {
// definition (in a main file only processed later) to fail
// with a mismatch error before the rewriter had a chance
// to act upon the definition.
-if (!isInMainFile(
+if (!compat::isInMainFile( compiler.getSourceManager(),
compiler.getSourceManager().getSpellingLoc(
functionDecl-getNameInfo().getLoc( {
return false;
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index f319e60..4a39182 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -17,6 +17,7 @@
#include clang/Lex/Lexer.h
#include pluginhandler.hxx
+#include compat.hxx
/*
Base classes for plugin actions.
@@ -73,6 +74,28 @@ Stmt* Plugin::parentStmt( Stmt* stmt )
return const_cast Stmt* ( parents[ stmt ] );
}
+
+bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const {
+StringRef name {
+compiler.getSourceManager().getFilename(spellingLocation) };
+return compat::isInMainFile(compiler.getSourceManager(), spellingLocation)
+? (name == SRCDIR /cppu/source/cppu/compat.cxx
+ || name == SRCDIR /cppuhelper/source/compat.cxx
+ || name == SRCDIR /sal/osl/all/compat.cxx)
+: (name.startswith(SRCDIR /include/com/)
+ || name.startswith(SRCDIR /include/cppu/)
+ || name.startswith(SRCDIR /include/cppuhelper/)
+ || name.startswith(SRCDIR /include/osl/)
+ || name.startswith(SRCDIR /include/rtl/)
+ ||
[Libreoffice-commits] core.git: 2 commits - stoc/source
stoc/source/typeconv/convert.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 266fa9f4f7bd536967c0430b67b203496930e250
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 24 12:04:33 2014 +0100
fVal-nVal
Change-Id: Ia5b041094f29e42cb60f2c83888cace42b91cc13
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 1a6a081..3a0e127 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -391,15 +391,15 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any rAny,
sal_Int64 min, sal_uInt6
// STRING
case TypeClass_STRING:
{
-sal_Int64 fVal = SAL_CONST_INT64(0);
-if (! getHyperValue( fVal, *(OUString const *)rAny.getValue() ))
+sal_Int64 nVal = SAL_CONST_INT64(0);
+if (! getHyperValue( nVal, *(OUString const *)rAny.getValue() ))
{
throw CannotConvertException(
invalid STRING value!,
ReferenceXInterface(), aDestinationClass,
FailReason::IS_NOT_NUMBER, 0 );
}
-nRet = fVal;
-if (fVal = min (fVal 0 || ((sal_uInt64)fVal) = max))
+nRet = nVal;
+if (nVal = min (nVal 0 || ((sal_uInt64)nVal) = max))
return nRet;
throw CannotConvertException(
STRING value out of range!,
commit a1b89677b79aa17db78e8eee010dea280c0f92a0
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 24 12:01:55 2014 +0100
coverity#982255 Operands don't affect result
fVal started out as a double, but is now a sal_Int64 since
commit 353607df2ed59f00ad67a74de29b3db662ea960a
Author: Lars Langhans l...@openoffice.org
Date: Mon Oct 9 13:21:27 2000 +
#79269# convert to hyper doesn't use toDouble any longer
so the comparison is always false
Change-Id: Ib0b0a78ba3763fb6564219e69111de13b5afc870
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index d04621f..1a6a081 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -398,7 +398,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any rAny,
sal_Int64 min, sal_uInt6
invalid STRING value!,
ReferenceXInterface(), aDestinationClass,
FailReason::IS_NOT_NUMBER, 0 );
}
-nRet = (fVal SAL_INT64_MAX ? (sal_Int64)(sal_uInt64)fVal :
(sal_Int64)fVal);
+nRet = fVal;
if (fVal = min (fVal 0 || ((sal_uInt64)fVal) = max))
return nRet;
throw CannotConvertException(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/8f2e44c2772af90e7be12dfc8bbf167f31f56b
cb/8f2e44c2772af90e7be12dfc8bbf167f31f56b |1 + 1 file changed, 1 insertion(+) New commits: commit 0ff36ed0df95688488eed3336f01f1ded36951a7 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 24 12:06:11 2014 +0100 Notes added by 'git notes add' diff --git a/cb/8f2e44c2772af90e7be12dfc8bbf167f31f56b b/cb/8f2e44c2772af90e7be12dfc8bbf167f31f56b new file mode 100644 index 000..625b63b --- /dev/null +++ b/cb/8f2e44c2772af90e7be12dfc8bbf167f31f56b @@ -0,0 +1 @@ +prefer: 08c475bb24a34f3a6a3f08e8490b521e8dcc96be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/plugin/aqua/sysplug.mm | 34 +++
1 file changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 4d93f2263d2712416b9fd3c7cd14fb9339ad5348
Author: Noel Grandin n...@peralex.com
Date: Tue Jun 24 13:12:26 2014 +0200
fix mac build
after my commit e2080e7 new compilerplugin returnbyref
Change-Id: Iec1663507ddda009903c31aa3ceedfe5380c1962
diff --git a/extensions/source/plugin/aqua/sysplug.mm
b/extensions/source/plugin/aqua/sysplug.mm
index 64e6d87..8fe218b 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -196,7 +196,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)mouseDown:(NSEvent*)i_pEvent
@@ -204,7 +204,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseDown;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)mouseDragged: (NSEvent*)i_pEvent
@@ -212,7 +212,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)mouseUp: (NSEvent*)i_pEvent
@@ -220,7 +220,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseUp;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)rightMouseDown:(NSEvent*)i_pEvent
@@ -228,7 +228,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseDown;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)rightMouseDragged: (NSEvent*)i_pEvent
@@ -236,7 +236,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)rightMouseUp: (NSEvent*)i_pEvent
@@ -244,7 +244,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseUp;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)otherMouseDown:(NSEvent*)i_pEvent
@@ -252,7 +252,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseDown;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)otherMouseDragged: (NSEvent*)i_pEvent
@@ -260,7 +260,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)otherMouseUp: (NSEvent*)i_pEvent
@@ -268,7 +268,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = mouseUp;
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)mouseEntered: (NSEvent*)i_pEvent
@@ -276,7 +276,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
-(void)mouseExited: (NSEvent*)i_pEvent
@@ -284,7 +284,7 @@ struct FakeEventRecord : public EventRecord
(void) i_pEvent; // unused
FakeEventRecord aRec;
aRec.what = aRec.what = osEvt + 18; // NPEventType_AdjustCursorEvent
-m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
+m_pCom-NPP_HandleEvent( m_pImpl-getNPPInstance(), aRec );
}
@end
@@ -397,7 +397,7 @@ IMPL_LINK_NOARG(MacPluginComm, NullTimerHdl)
{
SysPlugData rPlugData( (*it)-getSysPlugData() );
if( rPlugData.m_pPlugView ) // for safety do not dispatch null events
before first
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||71625 --- Comment #164 from Jay Philips philip...@hotmail.com --- Bug 71625: Autosave repeated loop freezes UI if file isnt saved prior to autosave. I've closed 4 of these bugs in the last 2 weeks. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding KACST font to libreoffice
On Tue, Jun 24, 2014 at 11:41:56AM +0100, Caolán McNamara wrote: The bundling is a potential pain, in the sense that we don't have any sort of policy about bundling fonts and I'm always a little worried that we'll end up with multiple gigs of font files bundled into LibreOffice to support a gadzillion languages. Not only for languages but also for $some_other_reason.. what we need to do to the fonts before added to libreoffice? Suitably licensed I suppose for a start, what is the license for the fonts ? Technically then it's follow the examples in external/more_fonts http://metadata.ftp-master.debian.org/changelogs//main/f/fonts-kacst/fonts-kacst_2.01+mry-10_copyright and http://metadata.ftp-master.debian.org/changelogs//main/f/fonts-kacst-one/fonts-kacst-one_5.0+svn11846-7_copyright say GPLv2 Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extensions/source
extensions/source/plugin/aqua/sysplug.mm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bcfc61a49fd3e6acccd155d5c0ce7746f8e97a03 Author: Noel Grandin n...@peralex.com Date: Tue Jun 24 13:19:25 2014 +0200 more mac build fix Change-Id: I4d0f1c21aed9bbcc97f432b0f1872c508853708c diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 8fe218b..27134d0 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -872,7 +872,7 @@ NPError MacPluginComm::NPP_SetWindow( XPlugin_Impl* i_pImpl ) if( pNPWin-width == 0 || pNPWin-height == 0 || [rPlugData.m_pPlugView isHiddenOrHasHiddenAncestor] ) rPlugData.m_bSetWindowOnDraw = true; -NPError nErr = NPP_SetWindow( i_pImpl-getNPPInstance(), i_pImpl-getNPWindow() ); +NPError nErr = NPP_SetWindow( i_pImpl-getNPPInstance(), i_pImpl-getNPWindow() ); return nErr; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/iconcdlg.cxx | 28 +---
cui/source/inc/iconcdlg.hxx |2 --
2 files changed, 1 insertion(+), 29 deletions(-)
New commits:
commit 56bbd709904b3a8b8932acbf72df4192d873c18f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 24 13:21:05 2014 +0200
-Werror,-Wunused-function -Werror,-Wunused-private-field
... -Werror,-Wunused-variable loplugin:bodynotinblock
Change-Id: I64742401e22b4b83364411a7454c755daa78d00c
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 0af84e0..5c795db 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -35,31 +35,6 @@
using ::std::vector;
-// some stuff for easier changes for SvtViewOptions
-static const sal_Char* pViewOptDataName = dialog data;
-#define VIEWOPT_DATANAMEOUString::createFromAscii( pViewOptDataName )
-
-static inline void SetViewOptUserItem( SvtViewOptions rOpt, const OUString
rData )
-{
-rOpt.SetUserItem( VIEWOPT_DATANAME, css::uno::makeAny( rData ) );
-}
-
-static inline OUString GetViewOptUserItem( const SvtViewOptions rOpt )
-{
-::com::sun::star::uno::Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) );
-OUString aUserData;
-aAny = aUserData;
-
-return aUserData;
-}
-
-
-
-
-// Class IconChoicePage
-
-
-
/**
|
| Ctor / Dtor
@@ -209,7 +184,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const
OString rID,
pOutSet ( NULL ),
pExampleSet ( NULL ),
pRanges ( NULL ),
-rId ( rID ),
bHideResetBtn ( false ),
bModal ( false ),
@@ -754,7 +728,7 @@ void IconChoiceDialog::Start_Impl()
nActPage = maPageList.front()-nId;
}*/
//else if ( USHRT_MAX != mnCurrentPageId GetPageData ( mnCurrentPageId
) != NULL )
-nActPage = mnCurrentPageId;
+nActPage = mnCurrentPageId;
mnCurrentPageId = nActPage;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index fb8ad2f..ceb2f19 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -144,8 +144,6 @@ private :
SfxItemSet* pExampleSet;
sal_uInt16* pRanges;
-const OString rId;
-
boolbHideResetBtn;
boolbModal;
boolbInOK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - bin/distro-install-file-lists
bin/distro-install-file-lists |2 ++ 1 file changed, 2 insertions(+) New commits: commit c5cb5ba73468b127fb0fa6118bde5b2fd2b883b9 Author: Tomáš Chvátal tchva...@suse.cz Date: Tue Jun 24 09:55:29 2014 +0200 Package filter in common pack Change-Id: I3728244712966cf2245a79f2630ac46cb63f1d21 Reviewed-on: https://gerrit.libreoffice.org/9876 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index ada7295..87c2a09 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -78,6 +78,7 @@ if test z$OOO_VENDOR != zDebian ; then rm -f common_list.txt for module in gid_Module_Root gid_Module_Root_Brand \ gid_Module_Root_Files_[0-9] \ +gid_Module_Filter \ gid_Module_Root_Hack \ gid_Module_Oo_Linguistic \ gid_Module_Root_Extension_Dictionary_* \ @@ -405,6 +406,7 @@ else create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common +create_package_directory gid_Module_Filter pkg/libreoffice-common create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8import/data/bnc875715.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |8 ++
sw/source/filter/ww8/ww8par.cxx | 36 +++---
3 files changed, 26 insertions(+), 18 deletions(-)
New commits:
commit 7637f765cf2f8f65aec5490bd36bf4c745d2cfc6
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Jun 24 14:14:14 2014 +0200
fix reading of section margins (bnc#875715)
The reason the section ended up with incorrect margins was because
that is computed as 'page margin' - 'section offset', and the order
of setting these up was backwards: First InsertSection() created
the section using the page margin of the old page, and only afterwards
SetSwFmtPageDesc() set the page margin that should be used.
Change-Id: I18ddcb0b5928879a2297b6caca766eab979abd45
diff --git a/sw/qa/extras/ww8import/data/bnc875715.doc
b/sw/qa/extras/ww8import/data/bnc875715.doc
new file mode 100644
index 000..af15e14
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc875715.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 8ef83c1..6d0de33 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -407,6 +407,14 @@ DECLARE_WW8IMPORT_TEST(testBnc863018, bnc863018.doc)
CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getPropertysal_Int32(xTable,
TopMargin));
}
+DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
+{
+uno::Referencetext::XTextSectionsSupplier
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xSections(xTextSectionsSupplier-getTextSections(), uno::UNO_QUERY);
+// Was incorrectly set as -1270.
+CPPUNIT_ASSERT_EQUAL(0, getPropertysal_Int32(xSections-getByIndex(0),
SectionLeftMargin));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ae1d28c..0eaf995 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4517,24 +4517,6 @@ void wwSectionManager::InsertSegments()
aSectPaM.GetPoint()-nContent.Assign(
aSectPaM.GetCntntNode(), 0);
-// End getting the bounds of this section, quite a job eh?
-SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
-// The last section if continuous is always unbalanced
-if (pRet)
-{
-// Set the columns to be UnBalanced if that compatability
option is set
-if (mrReader.pWDop-fNoColumnBalance)
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-else
-{
-// Otherwise set to unbalanced if the following section is
-// not continuous, (which also means that the last section
-// is unbalanced)
-if (aNext == aEnd || !aNext-IsContinuous())
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-}
-}
-
bool bHasOwnHdFt = false;
/*
In this nightmare scenario the continuous section has its own
@@ -4580,6 +4562,24 @@ void wwSectionManager::InsertSegments()
aIter-mpPage = pOrig;
}
}
+
+// End getting the bounds of this section, quite a job eh?
+SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
+// The last section if continuous is always unbalanced
+if (pRet)
+{
+// Set the columns to be UnBalanced if that compatability
option is set
+if (mrReader.pWDop-fNoColumnBalance)
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+else
+{
+// Otherwise set to unbalanced if the following section is
+// not continuous, (which also means that the last section
+// is unbalanced)
+if (aNext == aEnd || !aNext-IsContinuous())
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+}
+}
}
if (pTxtNd)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC Refactor god objects weekly report
This week I refactored IDocumentListItems and started working on IDocumentListsAccess. Valentin Am 17.06.2014 21:57, schrieb V: This week I refactored IDocumentTimerAccess and IDocumentLinksAdministrator out of SwDoc. These reports are getting kind of minimal but I hope thats fine ;) . Valentin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svl/source
svl/source/items/itempool.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 21e977167664e8b5ae86c712b08fde045af7fafd
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Jun 24 13:56:51 2014 +0100
Improve SfxItemPool documentation.
Change-Id: If5a555dae067d023c9dd1fd8e0409ca327739f08
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index d18b122..1990d46 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -711,6 +711,9 @@ const SfxPoolItem SfxItemPool::Put( const SfxPoolItem
rItem, sal_uInt16 nWhich
SfxPoolItemArrayBase_Impl::iterator ppFree;
bool ppFreeIsSet = false;
+
+// Is this a 'poolable' item - ie. should we re-use and return
+// the same underlying item for equivalent (==) SfxPoolItems ?
if ( IsItemFlag_Impl( nIndex, SFX_ITEM_POOLABLE ) )
{
// if is already in a pool, then it is worth checking if it is in this
one.
@@ -751,7 +754,7 @@ const SfxPoolItem SfxItemPool::Put( const SfxPoolItem
rItem, sal_uInt16 nWhich
}
else
{
-// look for a freed place
+// Unconditionally insert; check for a recently freed place
if (pItemArr-maFree.size() 0)
{
SfxPoolItemArrayBase_Impl::iterator itr = pItemArr-begin();
@@ -765,7 +768,7 @@ const SfxPoolItem SfxItemPool::Put( const SfxPoolItem
rItem, sal_uInt16 nWhich
}
}
-// nicht vorhanden, also im PtrArray eintragen
+// 3. not found, so clone to insert into the pointer array.
SfxPoolItem* pNewItem = rItem.Clone(pImp-mpMaster);
pNewItem-SetWhich(nWhich);
#ifdef DBG_UTIL
@@ -782,6 +785,7 @@ const SfxPoolItem SfxItemPool::Put( const SfxPoolItem
rItem, sal_uInt16 nWhich
#endif
AddRef( *pNewItem, pImp-nInitRefCount );
+// 4. finally insert into the pointer array
assert( pItemArr-maHash.find(pNewItem) == pItemArr-maHash.end() );
if ( !ppFreeIsSet )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - editeng/source filter/source forms/source toolkit/source
editeng/source/editeng/eehtml.cxx|1
filter/source/config/cache/typedetection.cxx | 81 +--
forms/source/xforms/binding.cxx |4 -
forms/source/xforms/binding.hxx |2
toolkit/source/awt/vclxwindow.cxx|1
5 files changed, 44 insertions(+), 45 deletions(-)
New commits:
commit 46b6721c030edc2c73600225c03e04125a0a911a
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 24 12:34:27 2014 +0100
coverity#706534 Uncaught exception
Change-Id: Iac2e63ee2588148f8c29c46684288f1fc69d4ff1
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index f937f5b..315bb3d 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -372,49 +372,47 @@ OUString SAL_CALL
TypeDetection::queryTypeByDescriptor(css::uno::Sequence css::
{
// make the descriptor more useable :-)
utl::MediaDescriptor stlDescriptor(lDescriptor);
+OUString sType, sURL;
-// SAFE - --
-::osl::ResettableMutexGuard aLock(m_aLock);
-
+try
+{
+// SAFE - --
+::osl::ResettableMutexGuard aLock(m_aLock);
-// parse given URL to split it into e.g. main and jump marks ...
-OUString sURL =
stlDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(),
OUString());
+// parse given URL to split it into e.g. main and jump marks ...
+sURL =
stlDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(),
OUString());
#if OSL_DEBUG_LEVEL 0
-if (stlDescriptor.find( FileName ) != stlDescriptor.end())
-OSL_FAIL(Detect using of deprecated and already unsupported
MediaDescriptor property \FileName\!);
+if (stlDescriptor.find( FileName ) != stlDescriptor.end())
+OSL_FAIL(Detect using of deprecated and already unsupported
MediaDescriptor property \FileName\!);
#endif
-css::util::URL aURL;
-aURL.Complete = sURL;
-css::uno::Reference css::util::XURLTransformer
xParser(css::util::URLTransformer::create(m_xContext));
-xParser-parseStrict(aURL);
+css::util::URL aURL;
+aURL.Complete = sURL;
+css::uno::Reference css::util::XURLTransformer
xParser(css::util::URLTransformer::create(m_xContext));
+xParser-parseStrict(aURL);
-OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault(
-utl::MediaDescriptor::PROP_FILTERNAME(), OUString());
-if (!aSelectedFilter.isEmpty())
-{
-// Caller specified the filter type. Honor it. Just get the default
-// type for that filter, and bail out.
-if (impl_validateAndSetFilterOnDescriptor(stlDescriptor,
aSelectedFilter))
-return
stlDescriptor[utl::MediaDescriptor::PROP_TYPENAME()].getOUString();
-}
+OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_FILTERNAME(), OUString());
+if (!aSelectedFilter.isEmpty())
+{
+// Caller specified the filter type. Honor it. Just get the
default
+// type for that filter, and bail out.
+if (impl_validateAndSetFilterOnDescriptor(stlDescriptor,
aSelectedFilter))
+return
stlDescriptor[utl::MediaDescriptor::PROP_TYPENAME()].getOUString();
+}
-FlatDetection lFlatTypes;
-impl_getAllFormatTypes(aURL, stlDescriptor, lFlatTypes);
+FlatDetection lFlatTypes;
+impl_getAllFormatTypes(aURL, stlDescriptor, lFlatTypes);
-aLock.clear();
-// - SAFE --
+aLock.clear();
+// - SAFE --
-// Properly prioritize all candidate types.
-lFlatTypes.sort(SortByPriority());
-lFlatTypes.unique(EqualByType());
+// Properly prioritize all candidate types.
+lFlatTypes.sort(SortByPriority());
+lFlatTypes.unique(EqualByType());
-OUString sType ;
-OUString sLastChance;
-
-try
-{
+OUString sLastChance;
// verify every flat detected (or preselected!) type
// by calling its registered deep detection service.
@@ -445,16 +443,17 @@ OUString SAL_CALL
TypeDetection::queryTypeByDescriptor(css::uno::Sequence css::
}
}
catch(const css::uno::RuntimeException)
-{ throw; }
+{
+throw;
+}
catch(const css::uno::Exception e)
-{
-SAL_WARN(
-filter.config,
-caught Exception \ e.Message
- \ while querying type of sURL );
-sType = OUString();
-}
-
+{
+SAL_WARN(
+filter.config,
+caught Exception \ e.Message
+ \ while querying type of sURL );
+sType = OUString();
+}
// adapt media
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - 3 commits - sc/inc sc/source svx/source sw/source
sc/inc/document.hxx |2 +
sc/source/core/data/document10.cxx | 50 +++
sc/source/ui/docshell/docsh.cxx |5 +++
sc/source/ui/inc/docsh.hxx |2 +
svx/source/tbxctrls/SvxColorValueSet.cxx |6 ---
sw/source/core/doc/docfmt.cxx| 17 ++
6 files changed, 71 insertions(+), 11 deletions(-)
New commits:
commit 7ced18afb479f880fa135802980e1f66dc832fd0
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Jun 24 15:32:18 2014 +0200
Add loading document colors to Calc
Change-Id: I06783b04dbbad2aa690820af1ca2cf05a1004f20
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 259d119..164f629d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1816,6 +1816,8 @@ public:
void CopyCellValuesFrom( const ScAddress rTopPos, const sc::CellValues
rSrc );
+std::vectorColor GetDocColors();
+
private:
ScDocument(const ScDocument r); // disabled with no definition
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index 4112bb9..8ecf3de 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -18,6 +18,12 @@
#include tokenstringcontext.hxx
#include poolhelp.hxx
+#include dociter.hxx
+#include patattr.hxx
+#include svl/whiter.hxx
+#include editeng/colritem.hxx
+#include scitems.hxx
+
// Add totally brand-new methods to this source file.
bool ScDocument::IsMerged( const ScAddress rPos ) const
@@ -234,6 +240,50 @@ void ScDocument::CopyCellValuesFrom( const ScAddress
rTopPos, const sc::CellVal
pTab-CopyCellValuesFrom(rTopPos.Col(), rTopPos.Row(), rSrc);
}
+std::vectorColor ScDocument::GetDocColors()
+{
+std::vectorColor docColors;
+
+for( unsigned int nTabIx = 0; nTabIx maTabs.size(); ++nTabIx )
+{
+ScUsedAreaIterator aIt(this, nTabIx, 0, 0, MAXCOLCOUNT-1,
MAXROWCOUNT-1);
+
+for( bool bIt = aIt.GetNext(); bIt; bIt = aIt.GetNext() )
+{
+const ScPatternAttr* pPattern = aIt.GetPattern();
+
+if( pPattern == 0 )
+continue;
+
+const SfxItemSet rItemSet = pPattern-GetItemSet();
+
+SfxWhichIter aIter( rItemSet );
+sal_uInt16 nWhich = aIter.FirstWhich();
+while( nWhich )
+{
+const SfxPoolItem *pItem;
+if( SFX_ITEM_SET == rItemSet.GetItemState( nWhich, false,
pItem ) )
+{
+sal_uInt16 aWhich = pItem-Which();
+if( ATTR_FONT_COLOR == aWhich ||
+ATTR_BACKGROUND == aWhich )
+{
+Color aColor( ((SvxColorItem*)pItem)-GetValue() );
+if( COL_AUTO != aColor.GetColor()
+std::find(docColors.begin(), docColors.end(),
aColor) == docColors.end() )
+{
+docColors.push_back( aColor );
+}
+}
+}
+
+nWhich = aIter.NextWhich();
+}
+}
+}
+return docColors;
+}
+
void ScDocument::SetCalcConfig( const ScCalcConfig rConfig )
{
maCalcConfig = rConfig;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 7ed1836..77d082a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -209,6 +209,11 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
}
}
+std::vectorColor ScDocShell::GetDocColors()
+{
+return aDocument.GetDocColors();
+}
+
void ScDocShell::DoEnterHandler()
{
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 89706d2..246cf0c 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -203,6 +203,8 @@ public:
sal_Int32 nFileFormat,
bool bTemplate = false ) const SAL_OVERRIDE;
+virtual std::vectorColor GetDocColors();
+
virtual boolInitNew( const ::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage ) SAL_OVERRIDE;
virtual boolLoad( SfxMedium rMedium ) SAL_OVERRIDE;
virtual boolLoadFrom( SfxMedium rMedium ) SAL_OVERRIDE;
commit 7f12b0e1f886b25d424f8df21cad8898957c6a5d
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Thu Jun 19 18:26:54 2014 +0200
Get more color attributes for document colors in Writer
Change-Id: I2005b434f20a56417105c7b26ce09155a7023023
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 86890b8..18626d2e 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2599,14 +2599,19 @@ std::vectorColor SwDoc::GetDocColors()
while( nWhich )
{
const SfxPoolItem *pItem;
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/view/drviews2.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit c0f03c75c71dde47e210ca23eefe3c879b89d97c Author: Armin Le Grand a...@apache.org Date: Tue Jun 24 12:48:21 2014 + i124816 use correct layer for new object when converting diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 5c8467e..320ce2c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -692,6 +692,9 @@ void DrawViewShell::FuTemporary(SfxRequest rReq) mpDrawView-DeleteMarkedObj(); } +// #124816# copy layer from lowest object which gets replaced +pGraphicObj-SetLayer(pReplacementCandidate-GetLayer()); + // now replace lowest object with new one mpDrawView-ReplaceObjectAtView(pReplacementCandidate, *pPageView, pGraphicObj); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Depends on||80384 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #165 from Kevin Suo suokunl...@gmail.com --- Added Bug 80384 - Chart Legend name lost on saving. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b82b495a520f8a714882fadde80687215acf44d4 Author: Mihai Varga mihai.m...@gmail.com Date: Tue Jun 24 17:19:49 2014 +0300 forgot the double quotes Change-Id: Ib5dc3cb83460130e8d229763daff56de8850a2e5 diff --git a/configure.ac b/configure.ac index 103b906..40b251e 100644 --- a/configure.ac +++ b/configure.ac @@ -12638,12 +12638,12 @@ ONEDRIVE_CLIENT_ID=\$with_onedrive_client_id\ ONEDRIVE_CLIENT_SECRET=\$with_onedrive_client_secret\ if test $with_onedrive_client_id = no -o -z $with_onedrive_client_id; then #ONEDRIVE_CLIENT_ID=\\ -ONEDRIVE_CLIENT_ID=441136A5 +ONEDRIVE_CLIENT_ID=\441136A5\ fi if test $with_onedrive_client_secret = no -o -z $with_onedrive_client_secret; then #ONEDRIVE_CLIENT_SECRET=\\ -ONEDRIVE_CLIENT_SECRET=280mTUglE4C5vbdNOoQAhNrWD5XyqBEV +ONEDRIVE_CLIENT_SECRET=\280mTUglE4C5vbdNOoQAhNrWD5XyqBEV\ fi if test -z $ONEDRIVE_CLIENT_ID -o -z $ONEDRIVE_CLIENT_SECRET; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav-neon/webdavcontent.hxx |1 +
ucb/source/ucp/webdav/SerfSession.cxx|1 +
ucb/source/ucp/webdav/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav/webdavcontent.hxx |1 +
5 files changed, 15 insertions(+)
New commits:
commit 956d088db5850e9a096bb9abd8b3e446e096f613
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 16:22:51 2014 +0200
fdo#72157: webdav: Release WebDAV file lock on document close.
Make it work with both serf and neon version.
Change-Id: I3c74ba57cde19f4417d0229c1c809756e3c5f9f8
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index fe49180..ea8ecb4 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -112,6 +112,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -144,6 +145,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -164,6 +166,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
@@ -2820,6 +2824,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -2849,6 +2854,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index d738ce2..7705c4e 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -91,6 +91,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool m_bLocked;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector OUString m_aFailedPropNames;
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index eea9644..a33b0a9 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1103,6 +1103,7 @@ void SerfSession::UNLOCK( const OUString inPath,
{
HandleError( aReqProc );
SAL_INFO(ucb.ucp.webdav, UNLOCK of inPath succeeded. );
+apr_environment::AprEnv::getAprEnv()-getSerfLockStore()-removeLock(
inPath );
}
catch(...)
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index dbc13b7..c91cfc2 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -207,6 +207,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -239,6 +240,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -259,6 +261,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
@@ -2944,6 +2948,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -2971,6 +2976,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index 04a115b..f6e0639 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -82,6 +82,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool m_bLocked;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector OUString m_aFailedPropNames;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sw/CppunitTest_sw_uiwriter.mk sw/qa sw/source
sw/CppunitTest_sw_uiwriter.mk|1
sw/qa/extras/uiwriter/data/cp171.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 45 +++
sw/source/core/inc/UndoSection.hxx |1
sw/source/core/undo/unsect.cxx |7
5 files changed, 54 insertions(+)
New commits:
commit a531676d6ddcda78f126781ca628cc2d5fc20277
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Jun 24 16:55:02 2014 +0200
fix broken redlines after undoing column count change (cp#171)
Changing a document with redlines to two columns and then using undo
set some redlines to point to the end of the document (done by
the call to RemoveIdxFromSection() in SwUndoInsSection::UndoImpl()).
Change-Id: I88b563b88beebcd1c3cb21fe61bb56cdb12cdc41
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 4ddff3a..1a1914e 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \
cppu \
cppuhelper \
sal \
+svl \
svt \
svxcore \
sw \
diff --git a/sw/qa/extras/uiwriter/data/cp171.odt
b/sw/qa/extras/uiwriter/data/cp171.odt
new file mode 100644
index 000..109e399
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/cp171.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 85c294c..2bf8d5a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -13,6 +13,10 @@
#include shellio.hxx
#include expfld.hxx
#include drawdoc.hxx
+#include docary.hxx
+#include redline.hxx
+#include section.hxx
+#include fmtclds.hxx
#include svx/svdpage.hxx
@@ -36,6 +40,7 @@ public:
void testFdo75898();
void testFdo74981();
void testShapeTextboxDelete();
+void testCp171();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -48,6 +53,7 @@ public:
CPPUNIT_TEST(testFdo75898);
CPPUNIT_TEST(testFdo74981);
CPPUNIT_TEST(testShapeTextboxDelete);
+CPPUNIT_TEST(testCp171);
CPPUNIT_TEST_SUITE_END();
private:
@@ -293,6 +299,45 @@ void SwUiWriterTest::testShapeTextboxDelete()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nActual);
}
+void SwUiWriterTest::testCp171()
+{
+SwDoc* pDoc = createDoc(cp171.odt);
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+
+const SwRedlineTbl rTbl = pDoc-GetRedlineTbl();
+CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
+sal_uLong redlineStart0NodeIndex = rTbl[ 0 ]-Start()-nNode.GetIndex();
+sal_Int32 redlineStart0Index = rTbl[ 0 ]-Start()-nContent.GetIndex();
+sal_uLong redlineEnd0NodeIndex = rTbl[ 0 ]-End()-nNode.GetIndex();
+sal_Int32 redlineEnd0Index = rTbl[ 0 ]-End()-nContent.GetIndex();
+sal_uLong redlineStart1NodeIndex = rTbl[ 1 ]-Start()-nNode.GetIndex();
+sal_Int32 redlineStart1Index = rTbl[ 1 ]-Start()-nContent.GetIndex();
+sal_uLong redlineEnd1NodeIndex = rTbl[ 1 ]-End()-nNode.GetIndex();
+sal_Int32 redlineEnd1Index = rTbl[ 1 ]-End()-nContent.GetIndex();
+
+// Change the document layout to be 2 columns, and then undo.
+pWrtShell-SelAll();
+SwSectionData section(CONTENT_SECTION, pWrtShell-GetUniqueSectionName());
+SfxItemSet set( pDoc-GetDocShell()-GetPool(), RES_COL, RES_COL, 0 );
+SwFmtCol col;
+col.Init( 2, 0, 1 );
+set.Put( col );
+pWrtShell-InsertSection( section, set );
+sw::UndoManager rUndoManager = pDoc-GetUndoManager();
+rUndoManager.Undo();
+
+// Check that redlines are the same like at the beginning.
+CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
+CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTbl[ 0
]-Start()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTbl[ 0
]-Start()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTbl[ 0
]-End()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTbl[ 0
]-End()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTbl[ 1
]-Start()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTbl[ 1
]-Start()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTbl[ 1
]-End()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTbl[ 1
]-End()-nContent.GetIndex());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/inc/UndoSection.hxx
b/sw/source/core/inc/UndoSection.hxx
index 7252412..4c769a6 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -38,6 +38,7 @@ private:
const ::std::auto_ptrSfxItemSet m_pAttrSet;
::std::auto_ptrSwHistory m_pHistory;
::std::auto_ptrSwRedlineData m_pRedlData;
+::std::auto_ptrSwRedlineSaveDatas m_pRedlineSaveData;
sal_uLong m_nSectionNodePos;
bool
Re: I need to better understand our css::uno::Reference
On 06/24/2014 04:23 AM, Lionel Elie Mamane wrote: On Mon, Jun 23, 2014 at 01:07:14PM +0200, Stephan Bergmann wrote: The trick is that we know that all compilers lay out the vtables in roughly the same way: No matter how many types a given type X derives from, a pointer to X points to a vtable containing function pointers for X's first base (if any) followed by function pointers for X's own members (if any). Aren't we missing X's other bases here? There needs to be function pointers for these, too, somewhere in the vtable. (I also understand that changing the order of derivation changes the ABI.) I guess the vtable is actually a depth-first left-to-right walk of the inheritance graph. X's other bases are of no interest here, as all we need is access to (one of its potentially many) XInterface vtables (of which there may be many different instances, but which necessarily all contain the same function pointers). (And your guess regarding vtable layout isn't quite right---a multiple-inheritance object has multiple vtables, one for each direct base subobject, where the derived class shares its vtable with its first direct base subobject at offset 0. At least that's how the Itanium ABI does it.) So as long as X represents any UNO interface type, the css::uno::ReferenceX ctor can do that dirty trick of reinterpret-casting pInterface to css::uno::XInterface* (...) Now, if you break the assumption that X represents a UNO interface type, that reinterpret_cast trick potentially breaks down. Do I understand right that: 1) UNO interface types are carefully translated to C++ so that (one of the multiple) css::uno::XInterface is always the first ultimate base, so that its function pointers are always the first in the vtable. This is what makes the reinterpret_cast trick work. yes 2) UNO interface types don't use virtual inheritance, but the C++ objects that implement them typically do, at least for the class that implements XInterface, and this is what ensures that all ways to call -acquire do use the same reference counters. Or they carefully inherit only from one such XInterface implementation... no, neither interface nor implementation types use virtual inheritance (and both potentially inherit XInterface multiple times); what disambiguates a css::uno::Reference's call to acquire is the hack discussed previously; what disambiguates a rtl::Reference's call to acquire is its override in cppu::WeakImplHelperN (or a similar override for classes not deriving from cppu::WeakImplHelperN but deriving from XInterface more than once) 3) The UNO interface types are (purely) abstract (all their methods are = 0; in the class definition), but this has nothing to do with the discussed problem. This does not change the vtable layout. yes Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - framework/source postprocess/qa
framework/source/fwi/threadhelp/transactionmanager.cxx |2 +-
postprocess/qa/services.cxx|3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit b1964a24a6cabdbd7b0633a85cc7e9cceac90c93
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 24 15:43:20 2014 +0100
ReportDefinition is the one that is failing for me under Linux too
Change-Id: I00480813d8c3703039a55a7a706937d33e8e8463
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 706010d..f6a07e4 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -38,7 +38,7 @@ public:
void ServicesTest::test()
{
std::vectorOUString blacklist;
-#if defined WNT
+
// On Windows, blacklist the com.sun.star.report.ReportDefinition service,
// as its reportdesign::OReportDefinition implementation (in
// reportdesign/source/core/api/ReportDefinition.cxx) spawns a thread that
@@ -54,7 +54,6 @@ void ServicesTest::test()
// ImplBorderWindow::ImplInit - Window::ImplInit -
// WinSalInstance::CreateFrame - ImplSendMessage - SendMessageW):
blacklist.push_back(com.sun.star.report.ReportDefinition);
-#endif
Reference XHierarchicalNameAccess xTypeManager(
m_xContext-getValueByName(
commit 1dac3254d554a38eafeec894e8e11eb163746281
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 24 15:49:13 2014 +0100
allow a frame to go from init state to close
without an intermediate working stage so it can be disposed after creation,
but
without a prior initialization like CppunitTest_services does
Change-Id: If2679fd0ce3657e727e34cfb0752501fc82df936
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx
b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 20bcdd6..3d001a8 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -74,7 +74,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode )
// Change working mode first!
if (
( m_eWorkingMode == E_INIT eMode == E_WORK) ||
-( m_eWorkingMode == E_WORK eMode == E_BEFORECLOSE ) ||
+( (m_eWorkingMode == E_WORK || m_eWorkingMode == E_INIT) eMode
== E_BEFORECLOSE ) ||
( m_eWorkingMode == E_BEFORECLOSE eMode == E_CLOSE ) ||
( m_eWorkingMode == E_CLOSEeMode == E_INIT)
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/CppunitTest_sw_uiwriter.mk sw/qa sw/source
sw/CppunitTest_sw_uiwriter.mk|1
sw/qa/extras/uiwriter/data/cp171.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 45 +++
sw/source/core/inc/UndoSection.hxx |1
sw/source/core/undo/unsect.cxx |7
5 files changed, 54 insertions(+)
New commits:
commit 7c49d84d8725b3decf77334888276bcbbed5ad0f
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Jun 24 16:55:02 2014 +0200
fix broken redlines after undoing column count change (cp#171)
Changing a document with redlines to two columns and then using undo
set some redlines to point to the end of the document (done by
the call to RemoveIdxFromSection() in SwUndoInsSection::UndoImpl()).
Change-Id: I88b563b88beebcd1c3cb21fe61bb56cdb12cdc41
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 721cbf6..62c7c4e 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \
cppu \
cppuhelper \
sal \
+svl \
svt \
sw \
test \
diff --git a/sw/qa/extras/uiwriter/data/cp171.odt
b/sw/qa/extras/uiwriter/data/cp171.odt
new file mode 100644
index 000..109e399
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/cp171.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e30db24..98bde55 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -9,6 +9,10 @@
#include swmodeltestbase.hxx
#include ndtxt.hxx
#include wrtsh.hxx
+#include docary.hxx
+#include redline.hxx
+#include section.hxx
+#include fmtclds.hxx
#include UndoManager.hxx
@@ -25,6 +29,7 @@ public:
void testFdo69893();
void testFdo75110();
void testFdo75898();
+void testCp171();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -32,6 +37,7 @@ public:
CPPUNIT_TEST(testFdo69893);
CPPUNIT_TEST(testFdo75110);
CPPUNIT_TEST(testFdo75898);
+CPPUNIT_TEST(testCp171);
CPPUNIT_TEST_SUITE_END();
private:
@@ -145,6 +151,45 @@ void SwUiWriterTest::testFdo69893()
CPPUNIT_ASSERT_EQUAL(OUString(Para after table.), rEnd.GetTxt());
}
+void SwUiWriterTest::testCp171()
+{
+SwDoc* pDoc = createDoc(cp171.odt);
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+
+const SwRedlineTbl rTbl = pDoc-GetRedlineTbl();
+CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
+sal_uLong redlineStart0NodeIndex = rTbl[ 0 ]-Start()-nNode.GetIndex();
+sal_Int32 redlineStart0Index = rTbl[ 0 ]-Start()-nContent.GetIndex();
+sal_uLong redlineEnd0NodeIndex = rTbl[ 0 ]-End()-nNode.GetIndex();
+sal_Int32 redlineEnd0Index = rTbl[ 0 ]-End()-nContent.GetIndex();
+sal_uLong redlineStart1NodeIndex = rTbl[ 1 ]-Start()-nNode.GetIndex();
+sal_Int32 redlineStart1Index = rTbl[ 1 ]-Start()-nContent.GetIndex();
+sal_uLong redlineEnd1NodeIndex = rTbl[ 1 ]-End()-nNode.GetIndex();
+sal_Int32 redlineEnd1Index = rTbl[ 1 ]-End()-nContent.GetIndex();
+
+// Change the document layout to be 2 columns, and then undo.
+pWrtShell-SelAll();
+SwSectionData section(CONTENT_SECTION, pWrtShell-GetUniqueSectionName());
+SfxItemSet set( pDoc-GetDocShell()-GetPool(), RES_COL, RES_COL, 0 );
+SwFmtCol col;
+col.Init( 2, 0, 1 );
+set.Put( col );
+pWrtShell-InsertSection( section, set );
+sw::UndoManager rUndoManager = pDoc-GetUndoManager();
+rUndoManager.Undo();
+
+// Check that redlines are the same like at the beginning.
+CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
+CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTbl[ 0
]-Start()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTbl[ 0
]-Start()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTbl[ 0
]-End()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTbl[ 0
]-End()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTbl[ 1
]-Start()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTbl[ 1
]-Start()-nContent.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTbl[ 1
]-End()-nNode.GetIndex());
+CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTbl[ 1
]-End()-nContent.GetIndex());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/inc/UndoSection.hxx
b/sw/source/core/inc/UndoSection.hxx
index 00de819..88e9ac3 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -39,6 +39,7 @@ private:
const ::std::auto_ptrSfxItemSet m_pAttrSet;
::std::auto_ptrSwHistory m_pHistory;
::std::auto_ptrSwRedlineData m_pRedlData;
+::std::auto_ptrSwRedlineSaveDatas m_pRedlineSaveData;
sal_uLong m_nSectionNodePos;
bool
[Libreoffice-commits] core.git: sw/CppunitTest_sw_uiwriter.mk
sw/CppunitTest_sw_uiwriter.mk |1 + 1 file changed, 1 insertion(+) New commits: commit f511a2915ed856f048fd7dd91fd9f7537b1e0479 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Tue Jun 24 17:15:58 2014 +0200 try to fix linker error on Windows caused by last commit Change-Id: Iaad40befcde683e8b85eefa5b58bcd350fea9f71 diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index 1a1914e..7e3e3e8 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \ cppu \ cppuhelper \ sal \ +sfx \ svl \ svt \ svxcore \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/CppunitTest_sw_uiwriter.mk
sw/CppunitTest_sw_uiwriter.mk |1 + 1 file changed, 1 insertion(+) New commits: commit db8dacf24f80f39375c9ff192c64c595243ae240 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Tue Jun 24 17:15:58 2014 +0200 try to fix linker error on Windows caused by last commit Change-Id: Iaad40befcde683e8b85eefa5b58bcd350fea9f71 (cherry picked from commit f511a2915ed856f048fd7dd91fd9f7537b1e0479) diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index 62c7c4e..7d9bee8 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \ cppu \ cppuhelper \ sal \ +sfx \ svl \ svt \ sw \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/f03c75c71dde47e210ca23eefe3c879b89d97c
c0/f03c75c71dde47e210ca23eefe3c879b89d97c |1 + 1 file changed, 1 insertion(+) New commits: commit c541aa3ad4b7972c337477ca11d3c7922e17f75e Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 24 16:26:23 2014 +0100 Notes added by 'git notes add' diff --git a/c0/f03c75c71dde47e210ca23eefe3c879b89d97c b/c0/f03c75c71dde47e210ca23eefe3c879b89d97c new file mode 100644 index 000..1ab4672 --- /dev/null +++ b/c0/f03c75c71dde47e210ca23eefe3c879b89d97c @@ -0,0 +1 @@ +merged as: a595879302e26a616131aa0cab5de31bb287b37d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/form/formcontroller.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a07f2fbc482c2644c4a80287b9139585150b30d1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 24 11:40:23 2014 +0200
fdo#75339: Substituting XInterface* eq. for object eq. requires
queryInterface
Regression introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 Use
the new
type-checking Reference constructor to reduce code noise which should have
left
(at least some) querying upcasts to XInterface alone. Closer inspection
of
that commit will probably turn up further regressions that need to be
reverted.
Change-Id: Ib81afc12d9df205b5b0fe6cec6ce85d012e9629f
(cherry picked from commit f8115ce72dad45b82b044d9c8f5c253d0514574d)
Reviewed-on: https://gerrit.libreoffice.org/9875
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index 109e77a..69cd855 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -353,6 +353,8 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
lcl_resetColumnControlInfo( *col );
+Reference XInterface xNormColumn( col-xColumn, UNO_QUERY_THROW
);
+
const Reference XControl * pControl( _rControls.getConstArray()
);
const Reference XControl * pControlEnd( pControl +
_rControls.getLength() );
for ( ; pControl != pControlEnd; ++pControl )
@@ -374,7 +376,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
{
Reference XPropertySet xGridColumnModel(
xGridColAccess-getByIndex( gridCol ), UNO_QUERY_THROW );
-if ( !lcl_isBoundTo( xGridColumnModel, col-xColumn
)
+if ( !lcl_isBoundTo( xGridColumnModel, xNormColumn )
|| !lcl_isInputRequired( xGridColumnModel )
)
continue; // with next grid column
@@ -394,7 +396,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
}
if ( !xModelPSI-hasPropertyByName( FM_PROP_BOUNDFIELD )
-|| !lcl_isBoundTo( xModel, col-xColumn )
+|| !lcl_isBoundTo( xModel, xNormColumn )
|| !lcl_isInputRequired( xModel )
)
continue; // with next control
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviews2.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit a595879302e26a616131aa0cab5de31bb287b37d Author: Armin Le Grand a...@apache.org Date: Tue Jun 24 12:48:21 2014 + Resolves: #i124816# use correct layer for new object when converting (cherry picked from commit c0f03c75c71dde47e210ca23eefe3c879b89d97c) Change-Id: Iaf6f9e040553482f5b7d9522ea640dcea0fdd8cc diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 2d503cd..4d4bd6a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -810,6 +810,9 @@ void DrawViewShell::FuTemporary(SfxRequest rReq) mpDrawView-DeleteMarkedObj(); } +// #i124816# copy layer from lowest object which gets replaced +pGraphicObj-SetLayer(pReplacementCandidate-GetLayer()); + // now replace lowest object with new one mpDrawView-ReplaceObjectAtView(pReplacementCandidate, *pPageView, pGraphicObj); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source
svx/source/form/formcontroller.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 12167e566c6c27b7bcd43e322f35ed6c799175e8
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jun 24 11:40:23 2014 +0200
fdo#75339: Substituting XInterface* eq. for object eq. requires
queryInterface
Regression introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 Use
the new
type-checking Reference constructor to reduce code noise which should have
left
(at least some) querying upcasts to XInterface alone. Closer inspection
of
that commit will probably turn up further regressions that need to be
reverted.
Change-Id: Ib81afc12d9df205b5b0fe6cec6ce85d012e9629f
(cherry picked from commit f8115ce72dad45b82b044d9c8f5c253d0514574d)
Reviewed-on: https://gerrit.libreoffice.org/9874
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index 0d4457c..2ea872c 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -354,6 +354,8 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
lcl_resetColumnControlInfo( *col );
+Reference XInterface xNormColumn( col-xColumn, UNO_QUERY_THROW
);
+
const Reference XControl * pControl( _rControls.getConstArray()
);
const Reference XControl * pControlEnd( pControl +
_rControls.getLength() );
for ( ; pControl != pControlEnd; ++pControl )
@@ -375,7 +377,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
{
Reference XPropertySet xGridColumnModel(
xGridColAccess-getByIndex( gridCol ), UNO_QUERY_THROW );
-if ( !lcl_isBoundTo( xGridColumnModel, col-xColumn
)
+if ( !lcl_isBoundTo( xGridColumnModel, xNormColumn )
|| !lcl_isInputRequired( xGridColumnModel )
)
continue; // with next grid column
@@ -395,7 +397,7 @@ void ColumnInfoCache::initializeControls( const Sequence
Reference XControl
}
if ( !xModelPSI-hasPropertyByName( FM_PROP_BOUNDFIELD )
-|| !lcl_isBoundTo( xModel, col-xColumn )
+|| !lcl_isBoundTo( xModel, xNormColumn )
|| !lcl_isInputRequired( xModel )
)
continue; // with next control
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/ww8import/data/bnc875715.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |8 ++
sw/source/filter/ww8/ww8par.cxx | 36 +++---
3 files changed, 26 insertions(+), 18 deletions(-)
New commits:
commit ead8309b638b138d5ebb4a5bac36871479cacaab
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Jun 24 14:14:14 2014 +0200
fix reading of section margins (bnc#875715)
The reason the section ended up with incorrect margins was because
that is computed as 'page margin' - 'section offset', and the order
of setting these up was backwards: First InsertSection() created
the section using the page margin of the old page, and only afterwards
SetSwFmtPageDesc() set the page margin that should be used.
Change-Id: I18ddcb0b5928879a2297b6caca766eab979abd45
(cherry picked from commit 7637f765cf2f8f65aec5490bd36bf4c745d2cfc6)
Reviewed-on: https://gerrit.libreoffice.org/9878
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ww8import/data/bnc875715.doc
b/sw/qa/extras/ww8import/data/bnc875715.doc
new file mode 100644
index 000..af15e14
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc875715.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 8ef83c1..6d0de33 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -407,6 +407,14 @@ DECLARE_WW8IMPORT_TEST(testBnc863018, bnc863018.doc)
CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getPropertysal_Int32(xTable,
TopMargin));
}
+DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
+{
+uno::Referencetext::XTextSectionsSupplier
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xSections(xTextSectionsSupplier-getTextSections(), uno::UNO_QUERY);
+// Was incorrectly set as -1270.
+CPPUNIT_ASSERT_EQUAL(0, getPropertysal_Int32(xSections-getByIndex(0),
SectionLeftMargin));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4712493..27274f2 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4519,24 +4519,6 @@ void wwSectionManager::InsertSegments()
aSectPaM.GetPoint()-nContent.Assign(
aSectPaM.GetCntntNode(), 0);
-// End getting the bounds of this section, quite a job eh?
-SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
-// The last section if continuous is always unbalanced
-if (pRet)
-{
-// Set the columns to be UnBalanced if that compatability
option is set
-if (mrReader.pWDop-fNoColumnBalance)
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-else
-{
-// Otherwise set to unbalanced if the following section is
-// not continuous, (which also means that the last section
-// is unbalanced)
-if (aNext == aEnd || !aNext-IsContinuous())
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-}
-}
-
bool bHasOwnHdFt = false;
/*
In this nightmare scenario the continuous section has its own
@@ -4582,6 +4564,24 @@ void wwSectionManager::InsertSegments()
aIter-mpPage = pOrig;
}
}
+
+// End getting the bounds of this section, quite a job eh?
+SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
+// The last section if continuous is always unbalanced
+if (pRet)
+{
+// Set the columns to be UnBalanced if that compatability
option is set
+if (mrReader.pWDop-fNoColumnBalance)
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+else
+{
+// Otherwise set to unbalanced if the following section is
+// not continuous, (which also means that the last section
+// is unbalanced)
+if (aNext == aEnd || !aNext-IsContinuous())
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+}
+}
}
if (pTxtNd)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx | 116 +---
1 file changed, 64 insertions(+), 52 deletions(-)
New commits:
commit e07cefb4f7ba39d59d25815e208ed61269079142
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 17:22:34 2014 +0200
webdav: Do not call into DAVResourceAccess with mutex locked.
This commit cherry-picks 0c3500115c4fd86284a027fc32be704afcf77061
for serf webdav version.
Change-Id: I108b0068cad847bf4947ece5e690f789ef034ae9
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index c91cfc2..faca565 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1472,8 +1472,8 @@ uno::Reference sdbc::XRow Content::getPropertyValues(
}
catch ( DAVException const e )
{
-bNetworkAccessAllowed
-= shouldAccessNetworkAfterException( e );
+bNetworkAccessAllowed = bNetworkAccessAllowed
+shouldAccessNetworkAfterException( e );
if ( !bNetworkAccessAllowed )
{
@@ -3329,66 +3329,78 @@ const Content::ResourceType Content::getResourceType(
bool * networkAccessAllowed )
throw ( uno::Exception )
{
-if ( m_eResourceType == UNKNOWN )
{
-osl::Guard osl::Mutex aGuard( m_aMutex );
+osl::MutexGuard g(m_aMutex);
+if (m_eResourceType != UNKNOWN) {
+return m_eResourceType;
+}
+}
-ResourceType eResourceType = UNKNOWN;
+ResourceType eResourceType = UNKNOWN;
-try
+try
+{
+// Try to fetch some frequently used property value, e.g. those
+// used when loading documents... along with identifying whether
+// this is a DAV resource.
+std::vector DAVResource resources;
+std::vector OUString aPropNames;
+uno::Sequence beans::Property aProperties( 5 );
+aProperties[ 0 ].Name = IsFolder;
+aProperties[ 1 ].Name = IsDocument;
+aProperties[ 2 ].Name = IsReadOnly;
+aProperties[ 3 ].Name = MediaType;
+aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
+
+ContentProperties::UCBNamesToDAVNames(
+aProperties, aPropNames );
+
+rResAccess-PROPFIND(
+DAVZERO, aPropNames, resources, xEnv );
+
+// TODO - is this really only one?
+if ( resources.size() == 1 )
{
-// Try to fetch some frequently used property value, e.g. those
-// used when loading documents... along with identifying whether
-// this is a DAV resource.
-std::vector DAVResource resources;
-std::vector OUString aPropNames;
-uno::Sequence beans::Property aProperties( 5 );
-aProperties[ 0 ].Name = IsFolder;
-aProperties[ 1 ].Name = IsDocument;
-aProperties[ 2 ].Name = IsReadOnly;
-aProperties[ 3 ].Name = MediaType;
-aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
-
-ContentProperties::UCBNamesToDAVNames(
-aProperties, aPropNames );
-
-rResAccess-PROPFIND(
-DAVZERO, aPropNames, resources, xEnv );
-
-// TODO - is this really only one?
-if ( resources.size() == 1 )
-{
-m_xCachedProps.reset(
-new CachableContentProperties( resources[ 0 ] ) );
-m_xCachedProps-containsAllNames(
-aProperties, m_aFailedPropNames );
-}
+osl::MutexGuard g(m_aMutex);
+m_xCachedProps.reset(
+new CachableContentProperties( resources[ 0 ] ) );
+m_xCachedProps-containsAllNames(
+aProperties, m_aFailedPropNames );
+}
-eResourceType = DAV;
+eResourceType = DAV;
+}
+catch ( DAVException const e )
+{
+rResAccess-resetUri();
+
+if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
+{
+// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
+// resource is NON_DAV
+eResourceType = NON_DAV;
}
-catch ( DAVException const e )
+else if (networkAccessAllowed != 0)
{
-rResAccess-resetUri();
-
-if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
-{
-// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
-// resource is NON_DAV
-eResourceType = NON_DAV;
-}
-else if (networkAccessAllowed != 0)
-{
-*networkAccessAllowed = *networkAccessAllowed
- shouldAccessNetworkAfterException(e);
-}
+
[Libreoffice-commits] core.git: rsc/source soltools/cpp soltools/mkdepend vcl/source
rsc/source/rscpp/cpp1.c |8 ++--
rsc/source/rscpp/cpp2.c | 24 ++--
rsc/source/rscpp/cpp3.c | 34 -
rsc/source/rscpp/cpp4.c | 36 +--
rsc/source/rscpp/cpp5.c | 40 ++---
rsc/source/rscpp/cpp6.c | 72 +++---
soltools/cpp/_getopt.c|4 +-
soltools/cpp/_lex.c |6 +--
soltools/mkdepend/cppsetup.c | 16
soltools/mkdepend/def.h | 20 +-
soltools/mkdepend/include.c | 26 ++---
soltools/mkdepend/main.c | 34 -
soltools/mkdepend/parse.c | 44 +++
soltools/mkdepend/pr.c| 22 +--
vcl/source/filter/jpeg/transupp.c |4 +-
15 files changed, 195 insertions(+), 195 deletions(-)
New commits:
commit 290b7e0632921ca0c204eb91c8ebfd253813f137
Author: Noel Grandin n...@peralex.com
Date: Tue Jun 24 07:44:01 2014 +0200
remove use of register keyword in C files
C compilers have been ignoring it for the last decade
Change-Id: I42918263121dd189bab9d27077798b779b9e8da1
Reviewed-on: https://gerrit.libreoffice.org/9873
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 8c03af5..e0ae7f5 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -230,7 +230,7 @@ void InitCpp1()
int MAIN(int argc, char** argv)
{
-register inti;
+inti;
char **useargv, **pfargv;
@@ -383,8 +383,8 @@ void cppmain()
* file.
*/
{
-register intc; /* Current character*/
-register intcounter;/* newlines and spaces */
+intc; /* Current character*/
+intcounter;/* newlines and spaces */
/*
* Explicitly output a #line at the start of cpp output so
@@ -569,7 +569,7 @@ void sharp()
* Output a line number line.
*/
{
-register char *name;
+char *name;
if (keepcomments) /* Make sure # comes on */
PUTCHAR('\n'); /* a fresh, new line. */
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index b7224ac..810d823 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -76,10 +76,10 @@ control(int counter)
* the end of the previous line if cpp is invoked with the -C option.
*/
{
-register intc;
-register char *tp;
-register inthash;
-char*ep;
+intc;
+char *tp;
+inthash;
+char *ep;
c = skipws();
if (c == '\n' || c == EOF_CHAR)
@@ -319,8 +319,8 @@ void doif(int hash)
* suppresses unnecessary warnings.
*/
{
-register intc;
-register intfound;
+intc;
+intfound;
if ((c = skipws()) == '\n' || c == EOF_CHAR) {
unget();
@@ -370,8 +370,8 @@ void doinclude()
* This restriction is unnecessary and not implemented.
*/
{
-register intc;
-register intdelim;
+intc;
+intdelim;
#if HOST == SYS_VMS
chardef_filename[NAM$C_MAXRSS + 1];
#endif
@@ -434,7 +434,7 @@ openinclude(char* filename, int searchlocal)
* if openinclude() fails. No error message is printed.
*/
{
-register char **incptr;
+char **incptr;
#if HOST == SYS_VMS
#if NFWORK (NAM$C_MAXRSS + 1)
error, NFWORK is not greater than NAM$C_MAXRSS
@@ -508,7 +508,7 @@ hasdirectory(char* source, char* result)
*/
{
#if HOST == SYS_UNIX
-register char *tp;
+char *tp;
if ((tp = strrchr(source, '/')) == NULL)
return (FALSE);
@@ -529,7 +529,7 @@ hasdirectory(char* source, char* result)
/*
* Random DEC operating system (RSX, RT11, RSTS/E)
*/
-register char *tp;
+char *tp;
if ((tp = strrchr(source, ']')) == NULL
(tp = strrchr(source, ':')) == NULL)
@@ -569,7 +569,7 @@ char*result;/* Size is at least
NAM$C_MAXRSS + 1*/
struct FAB fab = cc$rms_fab; /* File access block*/
struct NAM nam = cc$rms_nam; /* File name block */
charfullname[NAM$C_MAXRSS + 1];
-register char *rp;/* Result pointer */
+char*rp;/* Result pointer */
fab.fab$l_nam = nam;
[Libreoffice-commits] core.git: soltools/mkdepend
soltools/mkdepend/cppsetup.c | 15 +-
soltools/mkdepend/def.h | 18 +--
soltools/mkdepend/ifparser.c | 235 +--
soltools/mkdepend/ifparser.h |7 -
soltools/mkdepend/include.c | 38 ++
soltools/mkdepend/main.c | 33 ++
soltools/mkdepend/parse.c| 64 ---
soltools/mkdepend/pr.c | 14 --
8 files changed, 186 insertions(+), 238 deletions(-)
New commits:
commit 0a0c70e05aab5f98f465e5155df3d40a9a423afe
Author: Noel Grandin n...@peralex.com
Date: Tue Jun 24 13:07:36 2014 +0200
mkdepend: cleanup indentation and function declarations
to make it easier to read
Change-Id: Iff0fe055c12358edc1be335ec83d0855cc32f03c
Reviewed-on: https://gerrit.libreoffice.org/9877
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c
index 9f6dc63..3833530 100644
--- a/soltools/mkdepend/cppsetup.c
+++ b/soltools/mkdepend/cppsetup.c
@@ -187,20 +187,17 @@ _my_eval_variable (IfParser *ip, const char *var, int len)
if (!s)
return 0;
do {
-var = s;
-if (!isvarfirstletter(*var))
+ var = s;
+ if (!isvarfirstletter(*var))
break;
-s = _lookup_variable (var, strlen(var));
+ s = _lookup_variable (var, strlen(var));
} while (s);
return atoi(var);
}
-int cppsetup(line, filep, inc)
-char *line;
-struct filepointer *filep;
-struct inclist *inc;
+int cppsetup(char *line, struct filepointer *filep, struct inclist *inc)
{
IfParser ip;
struct _parse_data pd;
@@ -216,9 +213,9 @@ int cppsetup(line, filep, inc)
(void) ParseIfExpression (ip, line, val);
if (val)
-return IF;
+ return IF;
else
-return IFFALSE;
+ return IFFALSE;
}
#endif /* CPP */
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 0515e42e..3ad3e16 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -125,15 +125,15 @@ struct symhash {
};
struct inclist {
-char*i_incstring; /* string from #include line */
-char*i_file;/* path name of the include file */
-struct inclist **i_list; /* list of files it itself includes */
-int i_listlen; /* length of i_list */
-boolean i_defchecked; /* whether defines have been checked */
-boolean i_notified; /* whether we have revealed includes */
-boolean i_marked; /* whether it's in the makefile */
-boolean i_searched; /* whether we have read this */
-boolean i_included_sym; /* whether #include SYMBOL was found */
+char*i_incstring; /* string from #include line */
+char*i_file; /* path name of the include file */
+struct inclist **i_list; /* list of files it itself includes */
+int i_listlen; /* length of i_list */
+boolean i_defchecked; /* whether defines have been checked */
+boolean i_notified;/* whether we have revealed includes */
+boolean i_marked; /* whether it's in the makefile */
+boolean i_searched;/* whether we have read this */
+boolean i_included_sym; /* whether #include SYMBOL was found */
/* Can't use i_list if TRUE */
};
diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c
index f9b4b66..d342aa0 100644
--- a/soltools/mkdepend/ifparser.c
+++ b/soltools/mkdepend/ifparser.c
@@ -123,66 +123,66 @@ parse_value (IfParser *g, const char *cp, int *valp)
switch (*cp) {
case '(':
-DO (cp = ParseIfExpression (g, cp + 1, valp));
-SKIPSPACE (cp);
-if (*cp != ')')
-return CALLFUNC(g, handle_error) (g, cp, ));
+DO (cp = ParseIfExpression (g, cp + 1, valp));
+SKIPSPACE (cp);
+if (*cp != ')')
+return CALLFUNC(g, handle_error) (g, cp, ));
-return cp + 1; /* skip the right paren */
+return cp + 1; /* skip the right paren */
case '!':
-DO (cp = parse_value (g, cp + 1, valp));
-*valp = !(*valp);
-return cp;
+DO (cp = parse_value (g, cp + 1, valp));
+*valp = !(*valp);
+return cp;
case '-':
-DO (cp = parse_value (g, cp + 1, valp));
-*valp = -(*valp);
-return cp;
+DO (cp = parse_value (g, cp + 1, valp));
+*valp = -(*valp);
+return cp;
case '#':
-DO (cp = parse_variable (g, cp + 1, var));
-SKIPSPACE (cp);
-if (*cp != '(')
-return CALLFUNC(g, handle_error) (g, cp, ();
-do {
DO (cp = parse_variable (g, cp + 1, var));
SKIPSPACE (cp);
-} while (*cp *cp != ')');
-if (*cp != ')')
-return CALLFUNC(g, handle_error) (g, cp, ));
-*valp = 1; /* XXX */
-return cp + 1;
+if (*cp != '(')
+return CALLFUNC(g, handle_error) (g, cp, ();
+do {
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ww8import/data/bnc875715.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |8 ++
sw/source/filter/ww8/ww8par.cxx | 37 +++---
3 files changed, 27 insertions(+), 18 deletions(-)
New commits:
commit 970883e70cfed3bfddd424aa897377f14ddbd667
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Tue Jun 24 14:14:14 2014 +0200
fix reading of section margins (bnc#875715)
The reason the section ended up with incorrect margins was because
that is computed as 'page margin' - 'section offset', and the order
of setting these up was backwards: First InsertSection() created
the section using the page margin of the old page, and only afterwards
SetSwFmtPageDesc() set the page margin that should be used.
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: I18ddcb0b5928879a2297b6caca766eab979abd45
Reviewed-on: https://gerrit.libreoffice.org/9879
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ww8import/data/bnc875715.doc
b/sw/qa/extras/ww8import/data/bnc875715.doc
new file mode 100644
index 000..af15e14
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc875715.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index dea54e5..db1ca82 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -270,6 +270,14 @@ DECLARE_WW8IMPORT_TEST(testBnc863018, bnc863018.doc)
CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getPropertysal_Int32(xTable,
TopMargin));
}
+DECLARE_WW8IMPORT_TEST(testBnc875715, bnc875715.doc)
+{
+uno::Referencetext::XTextSectionsSupplier
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xSections(xTextSectionsSupplier-getTextSections(), uno::UNO_QUERY);
+// Was incorrectly set as -1270.
+CPPUNIT_ASSERT_EQUAL(0, getPropertysal_Int32(xSections-getByIndex(0),
SectionLeftMargin));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0725a9a..7312c7b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4495,24 +4495,6 @@ void wwSectionManager::InsertSegments()
aSectPaM.GetPoint()-nContent.Assign(
aSectPaM.GetCntntNode(), 0);
-// End getting the bounds of this section, quite a job eh?
-SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
-// The last section if continous is always unbalanced
-if (pRet)
-{
-// Set the columns to be UnBalanced if that compatability
option is set
-if (mrReader.pWDop-fNoColumnBalance)
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-else
-{
-// Otherwise set to unbalanced if the following section is
-// not continuous, (which also means that the last section
-// is unbalanced)
-if (aNext == aEnd || !aNext-IsContinuous())
-pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
-}
-}
-
bool bHasOwnHdFt = false;
/*
In this nightmare scenario the continuous section has its own
@@ -4558,6 +4540,25 @@ void wwSectionManager::InsertSegments()
aIter-mpPage = pOrig;
}
}
+
+// End getting the bounds of this section, quite a job eh?
+SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
+// The last section if continous is always unbalanced
+if (pRet)
+{
+// Set the columns to be UnBalanced if that compatability
option is set
+if (mrReader.pWDop-fNoColumnBalance)
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+else
+{
+// Otherwise set to unbalanced if the following section is
+// not continuous, (which also means that the last section
+// is unbalanced)
+if (aNext == aEnd || !aNext-IsContinuous())
+pRet-SetFmtAttr(SwFmtNoBalancedColumns(true));
+}
+}
+
}
if (pTxtNd)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basegfx/source
basegfx/source/polygon/b2dpolygoncutandtouch.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9b10e4065bfa5288d212501317cd612835b31d67
Author: David Tardon dtar...@redhat.com
Date: Mon Jun 23 17:11:30 2014 +0200
fdo#79615 create clipping polygon correctly
Change-Id: I758b6bc8da33a20a0807da171120a8f84214dcfd
(cherry picked from commit 8fae55c7d3fead6ce18556d5ccaa0958b7cfed91)
Reviewed-on: https://gerrit.libreoffice.org/9864
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 37fa50c..927af88 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -247,7 +247,7 @@ namespace basegfx
const double fOne(1.0);
fCut = (aVecB.getY() * (rCurrB.getX() - rCurrA.getX())
+ aVecB.getX() * (rCurrA.getY() - rCurrB.getY())) / fCut;
-if(fTools::more(fCut, fZero) fTools::less(fCut,
fOne))
+if(fTools::moreOrEqual(fCut, fZero)
fTools::lessOrEqual(fCut, fOne))
{
// it's a candidate, but also need to test
parameter value of cut on line 2
double fCut2;
@@ -262,7 +262,7 @@ namespace basegfx
fCut2 = (rCurrA.getY() + (fCut * aVecA.getY())
- rCurrB.getY()) / aVecB.getY();
}
-if(fTools::more(fCut2, fZero)
fTools::less(fCut2, fOne))
+if(fTools::moreOrEqual(fCut2, fZero)
fTools::lessOrEqual(fCut2, fOne))
{
// cut is in range, add point. Two edges can
have only one cut, but
// add a cut point to each list. The lists may
be the same for
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docnew.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit d3070bc5f9a7b1b93223c97c7167806f3b41b9fc
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Mon Jun 23 09:10:22 2014 +0200
Update SwDoc::Paste from SwFEShell::Paste
SwDoc::Paste is already an minimal version of SwFEShell::Paste.
Update the code based on the changes made in
commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b
Change-Id: I4d784f393952374e2a174510f9378b05cfdb78eb
Reviewed-on: https://gerrit.libreoffice.org/9861
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 182d3af..0ac491b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1027,14 +1027,15 @@ void SwDoc::Paste( const SwDoc rSource )
aIndexBefore--;
rSource.CopyRange( aCpyPam, rInsPos, true );
+// Note: aCpyPam is invalid now
-{
-++aIndexBefore;
-SwPaM aPaM(SwPosition(aIndexBefore),
- SwPosition(rInsPos.nNode));
+++aIndexBefore;
+SwPaM aPaM(SwPosition(aIndexBefore),
+ SwPosition(rInsPos.nNode));
-MakeUniqueNumRules(aPaM);
-}
+aPaM.GetDoc()-MakeUniqueNumRules(aPaM);
+
+// No need to update the rsid, as this is an empty doc
}
//TODO: Is this necessary here? SaveTblBoxCntnt( rInsPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx | 49
1 file changed, 49 insertions(+)
New commits:
commit 212dce21b62a4cfb85406bebe54ee07545516e21
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Mon Jun 23 08:43:08 2014 +0200
Save debug mail merge documents
This saves the first three mail merge documents, the source and
the corresponding working documents.
For convenience all saved document URIs printed to the console.
Change-Id: Ice86bf59fc519cfab170ff0956559dc9373d5a26
Reviewed-on: https://gerrit.libreoffice.org/9860
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 5565ef6..852879d 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2655,10 +2655,41 @@ uno::ReferenceXResultSet
SwDBManager::createCursor(const OUString _sDataSourc
return xResultSet;
}
+#ifdef DBG_UTIL
+
+#define MAX_DOC_DUMP 3
+
+static void lcl_SaveDoc( SfxObjectShell *xTargetDocShell,
+ const char *name, int no = 0 )
+{
+boost::scoped_ptr utl::TempFile aTempFile;
+OUString sExt( .odt );
+OUString basename = OUString::createFromAscii( name );
+if (no 0 )
+basename += OUString::number(no) + -;
+aTempFile.reset( new utl::TempFile( basename, true, sExt ) );
+OSL_ENSURE( aTempFile.get(), Temporary file not available );
+INetURLObject aTempFileURL( aTempFile-GetURL() );
+SfxMedium* pDstMed = new SfxMedium(
+aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
+STREAM_STD_READWRITE );
+xTargetDocShell-DoSaveAs( *pDstMed );
+xTargetDocShell-DoSaveCompleted( pDstMed );
+if( xTargetDocShell-GetError() )
+SAL_WARN( sw.mailmerge, Error saving: aTempFile-GetURL() );
+else
+SAL_INFO( sw.mailmerge, Saved doc as: aTempFile-GetURL() );
+}
+#endif
+
// merge all data into one resulting document and return the number of merged
documents
sal_Int32 SwDBManager::MergeDocuments( SwMailMergeConfigItem rMMConfig,
SwView rSourceView )
{
+#ifdef DBG_UTIL
+lcl_SaveDoc( rSourceView.GetDocShell(), MergeSource );
+#endif
+
// check the availability of all data in the config item
uno::Reference XResultSet xResultSet = rMMConfig.GetResultSet();
if(!xResultSet.is())
@@ -2721,6 +2752,9 @@ sal_Int32 SwDBManager::MergeDocuments(
SwMailMergeConfigItem rMMConfig,
// create a target docshell to put the merged document into
SfxObjectShellRef xTargetDocShell( new SwDocShell(
SFX_CREATE_MODE_STANDARD ) );
xTargetDocShell-DoInitNew( 0 );
+#ifdef DBG_UTIL
+lcl_SaveDoc( xTargetDocShell, MergeDoc );
+#endif
SfxViewFrame* pTargetFrame = SfxViewFrame::LoadHiddenDocument(
*xTargetDocShell, 0 );
//the created window has to be located at the same position as the
source window
@@ -2777,6 +2811,11 @@ sal_Int32 SwDBManager::MergeDocuments(
SwMailMergeConfigItem rMMConfig,
{
xWorkDocSh =
rSourceView.GetDocShell()-GetDoc()-CreateCopy(true);
}
+#ifdef DBG_UTIL
+if ( nDocNo = MAX_DOC_DUMP )
+lcl_SaveDoc( xWorkDocSh, WorkDoc, nDocNo );
+#endif
+
//create a ViewFrame
SwView* pWorkView = static_cast SwView* (
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )-GetViewShell() );
SwWrtShell rWorkShell = pWorkView-GetWrtShell();
@@ -2864,6 +2903,11 @@ sal_Int32 SwDBManager::MergeDocuments(
SwMailMergeConfigItem rMMConfig,
pWorkDoc-AppendTxtNode( aTestPos );
}
}
+
+#ifdef DBG_UTIL
+if ( nDocNo = MAX_DOC_DUMP )
+lcl_SaveDoc( xWorkDocSh, WorkDoc, nDocNo );
+#endif
pTargetShell-Paste( rWorkShell.GetDoc(), true );
//convert fields in page styles (header/footer - has to be done
after the first document has been pasted
if(1 == nDocNo)
@@ -2871,6 +2915,11 @@ sal_Int32 SwDBManager::MergeDocuments(
SwMailMergeConfigItem rMMConfig,
pTargetShell-CalcLayout();
pTargetShell-ConvertFieldsToText();
}
+#ifdef DBG_UTIL
+if ( nDocNo = MAX_DOC_DUMP )
+lcl_SaveDoc( xTargetDocShell, MergeDoc );
+#endif
+
//add the document info to the config item
SwDocMergeInfo aMergeInfo;
aMergeInfo.nStartPageInTarget = nPageCountBefore;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/gallery2/gallery1.cxx | 38 ++
1 file changed, 10 insertions(+), 28 deletions(-)
New commits:
commit 2a8a97dbc56b9db3ef59c324ada05981d00a14b2
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jun 21 19:53:37 2014 +0200
Resolves: fdo#80327 Sound list box when non-English UI
Fallback strings are in English wheresas ImplGetThemeEntry expects
localized strings
Let's put localized strings in fallback to make ImplGetThemeEntry happy
Change-Id: I27dd992bac4f5aaf6e0e6237fe59dac990f11c92
Reviewed-on: https://gerrit.libreoffice.org/9846
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 12f2a0a..004570b 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -434,66 +434,48 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId )
const
// try fallback, if no entry was found
if( !pFound )
{
-OString aFallback;
+OUString aFallback;
switch( nThemeId )
{
case( GALLERY_THEME_3D ):
-aFallback = 3D;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_3D);
break;
case( GALLERY_THEME_BULLETS ):
-aFallback = Bullets;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_BULLETS);
break;
case( GALLERY_THEME_HOMEPAGE ):
-aFallback = Homepage;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE);
break;
case( GALLERY_THEME_POWERPOINT ):
-aFallback = private://gallery/hidden/imgppt;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_POWERPOINT);
break;
case( GALLERY_THEME_FONTWORK ):
-aFallback = private://gallery/hidden/fontwork;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK);
break;
case( GALLERY_THEME_FONTWORK_VERTICAL ):
-aFallback = private://gallery/hidden/fontworkvertical;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK_VERTICAL);
break;
case( GALLERY_THEME_SOUNDS ):
-aFallback = Sounds;
+aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS);
break;
case( RID_GALLERYSTR_THEME_ARROWS ):
-aFallback = Arrows;
-break;
case( RID_GALLERYSTR_THEME_COMPUTERS ):
-aFallback = Computers;
-break;
case( RID_GALLERYSTR_THEME_DIAGRAMS ):
-aFallback = Diagrams;
-break;
case( RID_GALLERYSTR_THEME_EDUCATION ):
-aFallback = Education;
-break;
case( RID_GALLERYSTR_THEME_ENVIRONMENT ):
-aFallback = Environment;
-break;
case( RID_GALLERYSTR_THEME_FINANCE ):
-aFallback = Finance;
-break;
case( RID_GALLERYSTR_THEME_PEOPLE ):
-aFallback = People;
-break;
case( RID_GALLERYSTR_THEME_SYMBOLS ):
-aFallback = Symbols;
-break;
case( RID_GALLERYSTR_THEME_TRANSPORT ):
-aFallback = Transport;
-break;
case( RID_GALLERYSTR_THEME_TXTSHAPES ):
-aFallback = Textshapes;
+aFallback = GAL_RESSTR(static_castsal_uInt32(nThemeId));
break;
default:
break;
}
-pFound =
const_castGallery*(this)-ImplGetThemeEntry(OStringToOUString(aFallback,
RTL_TEXTENCODING_ASCII_US));
+pFound = const_castGallery*(this)-ImplGetThemeEntry(aFallback);
}
return( pFound ? pFound-GetThemeName() : OUString() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/qa sw/source
dev/null |binary
sw/inc/hintids.hxx | 66 +--
sw/inc/textboxhelper.hxx |2
sw/qa/extras/uiwriter/data/shape-textbox.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 24 +
sw/source/core/doc/textboxhelper.cxx | 15 ++
sw/source/core/frmedt/feshview.cxx | 17 ++
sw/source/uibase/docvw/edtwin.cxx| 19 ++-
8 files changed, 107 insertions(+), 36 deletions(-)
New commits:
commit de00dd0a4e9c10e283f5b8093ac1771545cbe243
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 24 17:51:05 2014 +0200
sw: update hintid comments to match reality
Change-Id: I9c7f620e08865531c70b1c4e655ed9f0aed9d319
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index e0a6685..4a0840d 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -230,49 +230,49 @@ RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
RES_AUTO_STYLE, // 125
RES_FRMATR_STYLE_NAME, // 126
RES_FRMATR_CONDITIONAL_STYLE_NAME, // 127
-RES_FRMATR_GRABBAG, // 130
-RES_TEXT_VERT_ADJUST, // 131
+RES_FRMATR_GRABBAG, // 128
+RES_TEXT_VERT_ADJUST, // 129
RES_FRMATR_END
};
enum RES_GRFATR
{
RES_GRFATR_BEGIN = RES_FRMATR_END,
-RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN,// 132
-RES_GRFATR_CROPGRF, // 133
-
-RES_GRFATR_ROTATION,// 134
-RES_GRFATR_LUMINANCE, // 135
-RES_GRFATR_CONTRAST,// 136
-RES_GRFATR_CHANNELR,// 137
-RES_GRFATR_CHANNELG,// 138
-RES_GRFATR_CHANNELB,// 139
-RES_GRFATR_GAMMA, // 140
-RES_GRFATR_INVERT, // 141
-RES_GRFATR_TRANSPARENCY,// 142
-RES_GRFATR_DRAWMODE,// 143
-
-RES_GRFATR_DUMMY1, // 144
-RES_GRFATR_DUMMY2, // 145
-RES_GRFATR_DUMMY3, // 146
-RES_GRFATR_DUMMY4, // 147
-RES_GRFATR_DUMMY5, // 148
+RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN,// 130
+RES_GRFATR_CROPGRF, // 131
+
+RES_GRFATR_ROTATION,// 132
+RES_GRFATR_LUMINANCE, // 133
+RES_GRFATR_CONTRAST,// 134
+RES_GRFATR_CHANNELR,// 135
+RES_GRFATR_CHANNELG,// 136
+RES_GRFATR_CHANNELB,// 137
+RES_GRFATR_GAMMA, // 138
+RES_GRFATR_INVERT, // 139
+RES_GRFATR_TRANSPARENCY,// 140
+RES_GRFATR_DRAWMODE,// 141
+
+RES_GRFATR_DUMMY1, // 142
+RES_GRFATR_DUMMY2, // 143
+RES_GRFATR_DUMMY3, // 144
+RES_GRFATR_DUMMY4, // 145
+RES_GRFATR_DUMMY5, // 146
RES_GRFATR_END
};
enum RES_BOXATR
{
RES_BOXATR_BEGIN = RES_GRFATR_END,
-RES_BOXATR_FORMAT = RES_BOXATR_BEGIN, // 149
-RES_BOXATR_FORMULA, // 150
-RES_BOXATR_VALUE, // 151
+RES_BOXATR_FORMAT = RES_BOXATR_BEGIN, // 147
+RES_BOXATR_FORMULA, // 148
+RES_BOXATR_VALUE, // 149
RES_BOXATR_END
};
enum RES_UNKNOWNATR
{
RES_UNKNOWNATR_BEGIN = RES_BOXATR_END,
-RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 152
+RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 150
RES_UNKNOWNATR_END
};
@@ -280,13 +280,13 @@ RES_UNKNOWNATR_END
enum RES_FMT
{
RES_FMT_BEGIN = RES_UNKNOWNATR_END,
-RES_CHRFMT = RES_FMT_BEGIN, // 144
-RES_FRMFMT, // 145
-RES_FLYFRMFMT, // 146
-RES_TXTFMTCOLL, // 147
-RES_GRFFMTCOLL, // 148
-RES_DRAWFRMFMT, // 149
-RES_CONDTXTFMTCOLL, // 150
+RES_CHRFMT = RES_FMT_BEGIN, // 151
+RES_FRMFMT, // 152
+RES_FLYFRMFMT, // 153
+RES_TXTFMTCOLL, // 154
+RES_GRFFMTCOLL,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx |6 +
ucb/source/ucp/webdav-neon/webdavcontent.hxx |1
ucb/source/ucp/webdav/SerfSession.cxx|1
ucb/source/ucp/webdav/webdavcontent.cxx | 128 +++
ucb/source/ucp/webdav/webdavcontent.hxx |4
5 files changed, 84 insertions(+), 56 deletions(-)
New commits:
commit 0c2e1906b3018ef9ce75920a4f4eb48e34795393
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 17:22:34 2014 +0200
webdav: Do not call into DAVResourceAccess with mutex locked.
This commit cherry-picks 0c3500115c4fd86284a027fc32be704afcf77061
for serf webdav version.
(cherry picked from commit e07cefb4f7ba39d59d25815e208ed61269079142)
Conflicts:
ucb/source/ucp/webdav/webdavcontent.cxx
Change-Id: I108b0068cad847bf4947ece5e690f789ef034ae9
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index f6de8ae..f053874 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1492,8 +1492,8 @@ uno::Reference sdbc::XRow Content::getPropertyValues(
}
catch ( DAVException const e )
{
-bNetworkAccessAllowed
-= shouldAccessNetworkAfterException( e );
+bNetworkAccessAllowed = bNetworkAccessAllowed
+shouldAccessNetworkAfterException( e );
if ( !bNetworkAccessAllowed )
{
@@ -3367,71 +3367,78 @@ const Content::ResourceType Content::getResourceType(
bool * networkAccessAllowed )
throw ( uno::Exception )
{
-if ( m_eResourceType == UNKNOWN )
{
-osl::Guard osl::Mutex aGuard( m_aMutex );
+osl::MutexGuard g(m_aMutex);
+if (m_eResourceType != UNKNOWN) {
+return m_eResourceType;
+}
+}
-ResourceType eResourceType = UNKNOWN;
+ResourceType eResourceType = UNKNOWN;
-try
+try
+{
+// Try to fetch some frequently used property value, e.g. those
+// used when loading documents... along with identifying whether
+// this is a DAV resource.
+std::vector DAVResource resources;
+std::vector OUString aPropNames;
+uno::Sequence beans::Property aProperties( 5 );
+aProperties[ 0 ].Name = IsFolder;
+aProperties[ 1 ].Name = IsDocument;
+aProperties[ 2 ].Name = IsReadOnly;
+aProperties[ 3 ].Name = MediaType;
+aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
+
+ContentProperties::UCBNamesToDAVNames(
+aProperties, aPropNames );
+
+rResAccess-PROPFIND(
+DAVZERO, aPropNames, resources, xEnv );
+
+// TODO - is this really only one?
+if ( resources.size() == 1 )
{
-// Try to fetch some frequently used property value, e.g. those
-// used when loading documents... along with identifying whether
-// this is a DAV resource.
-std::vector DAVResource resources;
-std::vector OUString aPropNames;
-uno::Sequence beans::Property aProperties( 5 );
-aProperties[ 0 ].Name
-= OUString::createFromAscii( IsFolder );
-aProperties[ 1 ].Name
-= OUString::createFromAscii( IsDocument );
-aProperties[ 2 ].Name
-= OUString::createFromAscii( IsReadOnly );
-aProperties[ 3 ].Name
-= OUString::createFromAscii( MediaType );
-aProperties[ 4 ].Name
-= DAVProperties::SUPPORTEDLOCK;
-
-ContentProperties::UCBNamesToDAVNames(
-aProperties, aPropNames );
-
-rResAccess-PROPFIND(
-DAVZERO, aPropNames, resources, xEnv );
-
-// TODO - is this really only one?
-if ( resources.size() == 1 )
-{
-m_xCachedProps.reset(
-new CachableContentProperties( resources[ 0 ] ) );
-m_xCachedProps-containsAllNames(
-aProperties, m_aFailedPropNames );
-}
+osl::MutexGuard g(m_aMutex);
+m_xCachedProps.reset(
+new CachableContentProperties( resources[ 0 ] ) );
+m_xCachedProps-containsAllNames(
+aProperties, m_aFailedPropNames );
+}
-eResourceType = DAV;
+eResourceType = DAV;
+}
+catch ( DAVException const e )
+{
+rResAccess-resetUri();
+
+if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
+{
+// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
+// resource is NON_DAV
+eResourceType = NON_DAV;
}
-catch ( DAVException const e )
+
[Libreoffice-commits] core.git: svx/source
svx/source/form/formcontroller.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 402e0c0a679dd4da2b1767d959be9aa364c1878d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jun 24 19:09:48 2014 +0200
fdo#75339 object comparison by reference, not pointer
Reference::operator== ensures that the comparison is done right.
::get may return different raw pointers for the same object,
yielding false positives.
Although the same end effect is reached by
commitf8115ce72dad45b82b044d9c8f5c253d0514574d
authorStephan Bergmann sberg...@redhat.com 2014-06-24 09:40:23
(GMT)
fdo#75339: Substituting XInterface* eq. for object eq. requires
queryInterface
This way is more robust against future clean-ups.
Change-Id: I2f3c63ac577152c666554b78b88d3779dabe4d45
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index 6660be4..e46897a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -308,7 +308,7 @@ namespace
bool lcl_isBoundTo( const Reference XPropertySet _rxControlModel,
const Reference XInterface _rxNormDBField )
{
Reference XInterface xNormBoundField(
_rxControlModel-getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY );
-return ( xNormBoundField.get() == _rxNormDBField.get() );
+return ( xNormBoundField == _rxNormDBField );
}
bool lcl_isInputRequired( const Reference XPropertySet _rxControlModel
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/gdi/outdev4.cxx | 27 ---
1 file changed, 4 insertions(+), 23 deletions(-)
New commits:
commit 87a3fe36ecc3a036806f1ca660c68debc763937d
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 17 12:58:09 2014 +0200
bnc#593614: Avoid rendering artefacts in presentation mode.
By not using XOR rendering, see also fdo#38844.
The first variant seems to work better.
Basically, this is just cherry-pick of
bb5c7d6a79309236d4f19bb2498f2e850f735a2f
Change-Id: I0fdccf60601a47c91f467f9d1321d1c25f1ef68c
Reviewed-on: https://gerrit.libreoffice.org/9824
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 1be80e9..e817e57 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -740,29 +740,10 @@ void OutputDevice::DrawGradient( const PolyPolygon
rPolyPoly,
mpMetaFile-AddAction( new MetaCommentAction( XGRAD_SEQ_BEGIN )
);
mpMetaFile-AddAction( new MetaGradientExAction( rPolyPoly,
rGradient ) );
-if( OUTDEV_PRINTER == meOutDevType )
-{
-Push( PUSH_CLIPREGION );
-IntersectClipRegion(Region(rPolyPoly));
-DrawGradient( aRect, rGradient );
-Pop();
-}
-else
-{
-const sal_Bool bOldOutput = IsOutputEnabled();
-
-EnableOutput( sal_False );
-Push( PUSH_RASTEROP );
-SetRasterOp( ROP_XOR );
-DrawGradient( aRect, rGradient );
-SetFillColor( COL_BLACK );
-SetRasterOp( ROP_0 );
-DrawPolyPolygon( rPolyPoly );
-SetRasterOp( ROP_XOR );
-DrawGradient( aRect, rGradient );
-Pop();
-EnableOutput( bOldOutput );
-}
+Push( PUSH_CLIPREGION );
+IntersectClipRegion(Region(rPolyPoly));
+DrawGradient( aRect, rGradient );
+Pop();
mpMetaFile-AddAction( new MetaCommentAction( XGRAD_SEQ_END ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/gridctrl.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit aa7b9062f68b1cfdd76ad1987bde5eed170ed6cf
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jun 24 20:02:00 2014 +0200
Revert Resolves fdo#75339 : No Error-Dialog appears in specific cases...
This reverts commit 701bbaf93f0d31ae73e94e0cebccb1cfba0e5882.
+ a824b27a6a8fc11f8378157aae04c08ebace8348
Conflicts:
svx/source/fmcomp/gridctrl.cxx
Change-Id: I03b40d1350328df5f789d9ea45cf6d7f53058926
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index fb71936..fd54088 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -40,7 +40,6 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/beans/PropertyChangeEvent.hpp
#include comphelper/processfactory.hxx
-#include cppuhelper/exc_hlp.hxx
#include tools/resid.hxx
#include tools/diagnose_ex.h
#include vcl/menu.hxx
@@ -3142,9 +3141,6 @@ bool DbGridControl::SaveRow()
catch(SQLException)
{
EndCursorAction();
-Any aError = cppu::getCaughtException();
-if ( aError.hasValue() )
-displayException( aError );
m_bUpdating = false;
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source sd/qa
editeng/source/editeng/impedit3.cxx |4 ++--
sd/qa/unit/data/xml/n593612_0.xml |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9388c45c0263a0090f9cb4be9c42b93b5f7985d0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Jun 23 11:37:47 2014 +0200
bnc#882631: Do not hide top of the first row when editing text in table
cells.
This can happen when proportional line spacing is less than 100%
and FontIndependentLineSpacing is set, so just keep the height
of the very first line in case of IsFixedCellHeight() too.
Change-Id: Id231fc1f2373645e5420f877e8c2568ce8a1f099
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 2881a81..d717b1a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1340,7 +1340,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
}
else if ( rLSItem.GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_PROP )
{
-if ( nPara || IsFixedCellHeight() || pLine-GetStartPortion()
) // Not the very first line
+if ( nPara || pLine-GetStartPortion() ) // Not the very first
line
{
// There are documents with PropLineSpace 0, why?
// (cmc: re above question :-) such documents can be seen
by importing a .ppt
@@ -1670,7 +1670,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine(
ParaPortion* pParaPortion, sal_uIn
else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP
)
{
sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion );
-if ( nPara || IsFixedCellHeight() || pTmpLine-GetStartPortion() )
// Not the very first line
+if ( nPara || pTmpLine-GetStartPortion() ) // Not the very first
line
{
// There are documents with PropLineSpace 0, why?
// (cmc: re above question :-) such documents can be seen by
importing a .ppt
diff --git a/sd/qa/unit/data/xml/n593612_0.xml
b/sd/qa/unit/data/xml/n593612_0.xml
index 5d5189b..5d03e58 100644
--- a/sd/qa/unit/data/xml/n593612_0.xml
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -1,6 +1,6 @@
?xml version=1.0?
XShapes
- XShape positionX=11429 positionY=1324 sizeX=2259 sizeY=15192
type=com.sun.star.drawing.CustomShape name=Rectangle 52
text=#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;
fontHeight=24.00 fontColor= textAutoGrowHeight=true
textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE
textHorizontalAdjust=CENTER textVerticalAdjust=TOP textLeftDistance=254
textRightDistance=254 textUpperDistance=127 textLowerDistance=127
textMaximumFrameHeight=0 textMaximumFrameWidth=0 textMinimumFrameHeight=0
textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0
textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE
textAnimationStartInside=false textAnimationStopInside=false
textWritingMode=LR_TB fillStyle=SOLID fillColor=3c8c93
fillTransparence=0 fillTran
sparenceGradientName=
+ XShape positionX=11429 positionY=1324 sizeX=2259 sizeY=15209
type=com.sun.star.drawing.CustomShape name=Rectangle 52
text=#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;#10;
fontHeight=24.00 fontColor= textAutoGrowHeight=true
textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE
textHorizontalAdjust=CENTER textVerticalAdjust=TOP textLeftDistance=254
textRightDistance=254 textUpperDistance=127 textLowerDistance=127
textMaximumFrameHeight=0 textMaximumFrameWidth=0 textMinimumFrameHeight=0
textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0
textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE
textAnimationStartInside=false textAnimationStopInside=false
textWritingMode=LR_TB fillStyle=SOLID fillColor=3c8c93
fillTransparence=0 fillTran
sparenceGradientName=
FillTransparenceGradient style=LINEAR startColor=00
endColor=ff angle=0 border=0 xOffset=50 yOffset=50
startIntensity=100 endIntensity=100 stepCount=0/
FillGradient style=LINEAR startColor=3465a4 endColor=ff angle=0
border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100
stepCount=0/
FillHatch style=SINGLE color=3465a4 distance=20 angle=0/
@@ -10,7 +10,7 @@
LineEnd/
Transformation
Line1 column1=2260.00 column2=0.00 column3=11429.00/
- Line2 column1=0.00 column2=15193.00 column3=1324.00/
+ Line2 column1=0.00 column2=15210.00 column3=1324.00/
Line3 column1=0.00 column2=0.00 column3=1.00/
/Transformation
CustomShapeGeometry
___
Libreoffice-commits mailing
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Depends on||80462 --- Comment #166 from Laurent BP jumbo4...@yahoo.fr --- Promote bug 80462 Crash on sorting single line. Regression between 4.2.4.2 and 4.2.5.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/slidehack2'
New branch 'feature/slidehack2' available with the following commits: commit 773401ce68387574039f3935b84317128bcef09b Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Tue Jun 24 21:01:13 2014 +0200 fix build after rebase Change-Id: Id014a49dbbb33123d2d04f9f33954b77575f2e9e commit 0674f57e7212556c56a78c646f13b2297238138c Author: Thorsten Behrens tbehr...@suse.com Date: Sat Apr 13 16:37:50 2013 +0200 Initial reading and parsing from webservice. Change-Id: I1637f8a8b21464e3883fd3dc8f6bb214dd58f6d0 commit c0de72c538367d02c03125a1293afe38d16df9e8 Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 18:21:11 2013 +0100 slidesorter - cleanup redundant caches and notifications. Change-Id: Ibe8106a77899f141d1e3722bcae615ab905b2568 commit 0410b287bcbff36dd9e3e4ee64399bebba1bbb9f Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 16:31:48 2013 +0100 slide-sorter: re-factor to improve bbox calcuation Always use a SlsPageDescriptor to calculate bbox, so we can adapt it to merge slides attributes where possible. Change-Id: Id719459adb069654ab712e22ea79fea96c1f commit 6ea4c50c452f42f9a24fe25001bae2d61b68283f Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 17:31:58 2013 +0100 infernal vspace wasteage removal. Change-Id: Ice0437cac9cd01b484174b1ce16c3118fb76e3e0 commit 14fd5faf63c562a47e8f2513f90122331551295c Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 13:54:25 2013 +0100 publish API for UI library, more slidehack stubs. Change-Id: Iaf5801b208023cfa0c437e8d00049598d5a7077d commit caa987318ba29809804054695f8d7c38b8612769 Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 13:40:41 2013 +0100 Impl. more of the group dialog. Change-Id: Iaa0636087c22380c8a29d9c9b73d177cda453ea5 commit 6f0861b39df1c60485b586c766edbc78fedf544f Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Tue Jun 24 01:00:41 2014 +0200 Revert Remove code marked by HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL tag. This reverts commit 7e4f9159ea1cd4a9cda453136c6274ff2841a482. commit 7e4f9159ea1cd4a9cda453136c6274ff2841a482 Author: vjinoch elian...@gmail.com Date: Tue Apr 9 18:06:36 2013 +0200 Remove code marked by HORRIBLE_OBSOLETE_YIELDMUTEX_IMPL tag. Change-Id: Ib87e3a5155176a6ce0531e04b08a2731a9c956a7 Reviewed-on: https://gerrit.libreoffice.org/3289 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com commit db7b714e3b66c5685ffeebb4fd61fca3a69945ed Author: Thorsten Behrens tbehr...@suse.com Date: Fri Apr 12 14:38:51 2013 +0200 Change fprintf - SAL_DEBUG Let's not forget to remove that before merge. commit 41eb683347663d20ed4a7fb5b41ea21a86066976 Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 20:13:50 2013 +0100 add lots of un-tested code to the GroupSlidesDialog. Change-Id: Id4c30f23dbee676f65511204d85bbcb47bc74e1d commit 4bc30e193c12816e2ce43ffda0adf70ce0a84ed5 Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 19:09:51 2013 +0100 kill over-complicated 'alternatives' scheme for now. Change-Id: I91d60be06a7f5b65575c3044e619859918353690 commit 2b9f8166b5e8747dcf45ebfbbb54f5e1193bc6c6 Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 17:25:32 2013 +0100 start of slide grouping UI in the slide-sorter. Change-Id: If19ee509b698cb69e8e7313837a4a5428f8b3d1d commit b8ef43dd5e2a7fec3fe43e206f9e24af46e59afb Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 15:53:49 2013 +0100 tag each slide with it's origin. Change-Id: I71e47cb5dbca8e70d846ff5e504c6edb01bd commit 87205cd6f20b69027ca23181f1f7ee42df0b3fa3 Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 15:24:31 2013 +0100 add slide grouping / un-grouping hooks. Change-Id: I156dff8d91a073d9e6e281c26434c963456cddce commit 28fd38aca90d8f24a8a72f1f0e0e2393721cbc3a Author: Michael Meeks michael.me...@suse.com Date: Wed Apr 10 12:21:24 2013 +0100 initial, horrible attempt at slidejockey / search pane. Apparently integrating with the View is really not entirely trivial. Change-Id: Id9db5fdb69b17d26d3ade9e09714c2fd49d744bd commit f0daad1119dcdd5cb68bf4bfc89181aeb953e252 Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 9 16:11:41 2013 +0100 more excessive whitespace redux. Change-Id: If7b03e5894b6ee8afbef756d866c0f605bb846ef commit 2a5a8417766e615790cbdb6617868ff49cad6c06 Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 9 14:31:40 2013 +0100 impress: wire up a new view - the slide jockey view. Change-Id: I9be6bf2a55f4e89d0cfb5ac426960d022ab2f490 commit 775f53174f8be204023a8f11314469d10bd841ac Author: Michael Meeks michael.me...@suse.com Date: Tue Apr 9 13:56:50 2013 +0100
[Libreoffice-commits] core.git: Branch 'feature/slidehack2' - sd/Library_sd.mk sd/source
sd/Library_sd.mk |5 +
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 17 ++---
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 5cdf5b3f0e52397a6863c030b860abc0eb88a70e
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Jun 24 21:15:06 2014 +0200
fix mis-merges
Change-Id: I254a6153936c7b2d649cadabeaa4e4e60984b904
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 580af5f..f1c7e7f 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -522,6 +522,11 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
))
endif # ENABLE_AVAHI=TRUE
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/remotecontrol/DiscoveryService \
+))
+
+
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,sd,\
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 5ba0492..829cecc 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -313,19 +313,20 @@ void PageObjectPainter::PaintCustomAnimationEffect (
EffectSequence::iterator aEnd = aMainSequence-getEnd();
if ( aIter != aEnd )
{
-const Rectangle aBox (mpPageObjectLayouter-GetBoundingBox(
+const Rectangle aBox (pPageObjectLayouter-GetBoundingBox(
rpDescriptor,
PageObjectLayouter::CustomAnimationEffectIndicator,
PageObjectLayouter::ModelCoordinateSystem));
rDevice.DrawBitmapEx(
aBox.TopCenter(),
-
mpPageObjectLayouter-GetCustomAnimationEffectIcon().GetBitmapEx());
+pPageObjectLayouter-GetCustomAnimationEffectIcon().GetBitmapEx());
}
}
-Bitmap PageObjectPainter::GetBackgroundForState (
-const model::SharedPageDescriptor rpDescriptor,
-const OutputDevice rReferenceDevice)
+void PageObjectPainter::PaintBackgroundDetail(
+PageObjectLayouter *pPageObjectLayouter,
+OutputDevice rDevice,
+const model::SharedPageDescriptor rpDescriptor) const
{
enum State { None = 0x00, Selected = 0x01, MouseOver = 0x02, Focused =
0x04 };
const int eState =
@@ -344,12 +345,6 @@ Bitmap PageObjectPainter::GetBackgroundForState (
break;
case MouseOver | Selected:
-return GetBackground(
-maMouseOverSelectedBackground,
-Theme::Gradient_MouseOverSelected,
-rReferenceDevice,
-false);
-
case MouseOver:
eColorType = Theme::Gradient_MouseOverPage;
bHasFocusBorder = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #167 from Aibara cranberrydoug...@yahoo.com --- I nominate bug 49514: search/find/replace has been broken for many releases when using footnotes in Writer. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer2' - 2 commits - libreofficekit/source sc/source
libreofficekit/source/gtk/lokdocview.c | 12
sc/source/ui/view/gridwin4.cxx | 15 ++-
2 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit a41b5c99900d94949413c146677e287a3b7a592f
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Jun 24 21:16:15 2014 +0100
Turns out document coordinates are already in TWIPs.
This now means that fonts are also correctly scaled,
whereas the 100th mm mapping caused fonts to be scaled
differently to the grid (i.e. looked ugly).
Change-Id: Ib8b913490823a7ba406e52291e52d50053ae32b8
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 470f150..e3ea993b 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -413,7 +413,7 @@ Size ScGridWindow::GetDataAreaSize()
// the data area.
// This doesn't include the final (bottom right) borders...
-return Size( nX * 1440L / 2540L, nY * 1440L / 2540L );
+return Size( nX, nY );
}
// Draw
@@ -926,25 +926,14 @@ void ScGridWindow::PaintTile( VirtualDevice rDevice,
int nTilePosX, int nTilePosY,
long nTileWidth, long nTileHeight )
{
-// Scaling. Must convert from pixels to TWIPs. We know
-// that VirtualDevices use a DPI of 96. We might as well do this
-// calculation now, rather than after another dimension conversion,
-// to minimise errors.
Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
Fraction( nTileWidth);
Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
Fraction( nTileHeight);
-// Now scale back to 100th mm dimensions.
-nTilePosX = nTilePosX * 2540L / 1440L;
-nTilePosY = nTilePosY * 2540L / 1440L;
-
-nTileWidth = nTileWidth * 2540L / 1440L;
-nTileHeight = nTileHeight * 2540L / 1440L;
-
rDevice.SetOutputSizePixel( Size( nOutputWidth, nOutputHeight ) );
MapMode aMapMode( rDevice.GetMapMode() );
-aMapMode.SetMapUnit( MAP_100TH_MM );
+aMapMode.SetMapUnit( MAP_TWIP );
aMapMode.SetOrigin( Point( -nTilePosX, -nTilePosY ) ); // size
aMapMode.SetScaleX( scaleX );
commit 60564dbd87703d90f3bd2c11f9e4357ea5a31ad9
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Jun 24 21:13:42 2014 +0100
LOK DocView: clean up document on exit.
Otherwise lock files etc. aren't cleaned up, which isn't particularly
nice should when then opening the file in normal LibreOffice.
Change-Id: I822b6fb582473674371a4c1d403d5a05adb7ea6b
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index 99f2b15..bf86679 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -17,6 +17,15 @@
static void lok_docview_class_init( LOKDocViewClass* pClass );
static void lok_docview_init( LOKDocView* pDocView );
+// We specifically need to destroy the document when closing in order to ensure
+// that lock files etc. are cleaned up.
+void lcl_onDestroy( LOKDocView* pDocView, gpointer pData )
+{
+(void) pData;
+pDocView-pDocument-pClass-destroy( pDocView-pDocument );
+pDocView-pDocument = 0;
+}
+
SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
{
static guint lok_docview_type = 0;
@@ -70,6 +79,9 @@ static void lok_docview_init( LOKDocView* pDocView )
pDocView-pDocument = 0;
pDocView-fZoom = 1;
+
+gtk_signal_connect( GTK_OBJECT(pDocView), destroy,
+GTK_SIGNAL_FUNC(lcl_onDestroy), NULL );
}
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_docview_new( LibreOfficeKit* pOffice )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TablePositionHandler.cxx | 69 ++-
1 file changed, 25 insertions(+), 44 deletions(-)
New commits:
commit 0c1904ec9fa574da49ccc988c6480e8d55916860
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jun 24 22:11:55 2014 +0200
Use comphelper::SequenceAsHashMap
Change-Id: I7d644980172c479191ecfab2e6dfcb60c11afc3f
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx
b/writerfilter/source/dmapper/TablePositionHandler.cxx
index ca20875..2c65271 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -16,6 +16,8 @@
#include com/sun/star/text/RelOrientation.hpp
#include dmapperLoggers.hxx
+#include comphelper/sequenceashashmap.hxx
+
namespace writerfilter
{
namespace dmapper
@@ -93,36 +95,23 @@ void TablePositionHandler::lcl_sprm(Sprm /*rSprm*/)
uno::Sequencebeans::PropertyValue TablePositionHandler::getTablePosition()
const
{
-uno::Sequence beans::PropertyValue aFrameProperties(19);
-beans::PropertyValue* pFrameProperties = aFrameProperties.getArray();
-
-pFrameProperties[0].Name = LeftBorderDistance;
-pFrameProperties[0].Value = sal_Int32(0);
-pFrameProperties[1].Name = RightBorderDistance;
-pFrameProperties[1].Value = sal_Int32(0);
-pFrameProperties[2].Name = TopBorderDistance;
-pFrameProperties[2].Value = sal_Int32(0);
-pFrameProperties[3].Name = BottomBorderDistance;
-pFrameProperties[3].Value = sal_Int32(0);
-
-pFrameProperties[4].Name = LeftMargin;
-pFrameProperties[4].Value =
ConversionHelper::convertTwipToMM100(m_nLeftFromText);
-pFrameProperties[5].Name = RightMargin;
-pFrameProperties[5].Value =
ConversionHelper::convertTwipToMM100(m_nRightFromText);
-pFrameProperties[6].Name = TopMargin;
-pFrameProperties[6].Value =
ConversionHelper::convertTwipToMM100(m_nTopFromText);
-pFrameProperties[7].Name = BottomMargin;
-pFrameProperties[7].Value =
ConversionHelper::convertTwipToMM100(m_nBottomFromText);
+comphelper::SequenceAsHashMap aFrameProperties;
+
+aFrameProperties[LeftBorderDistance] = sal_Int32(0);
+aFrameProperties[RightBorderDistance] = sal_Int32(0);
+aFrameProperties[TopBorderDistance] = sal_Int32(0);
+aFrameProperties[BottomBorderDistance] = sal_Int32(0);
+
+aFrameProperties[LeftMargin] =
ConversionHelper::convertTwipToMM100(m_nLeftFromText);
+aFrameProperties[RightMargin] =
ConversionHelper::convertTwipToMM100(m_nRightFromText);
+aFrameProperties[TopMargin] =
ConversionHelper::convertTwipToMM100(m_nTopFromText);
+aFrameProperties[BottomMargin] =
ConversionHelper::convertTwipToMM100(m_nBottomFromText);
table::BorderLine2 aEmptyBorder;
-pFrameProperties[8].Name = TopBorder;
-pFrameProperties[8].Value = aEmptyBorder;
-pFrameProperties[9].Name = BottomBorder;
-pFrameProperties[9].Value = aEmptyBorder;
-pFrameProperties[10].Name = LeftBorder;
-pFrameProperties[10].Value = aEmptyBorder;
-pFrameProperties[11].Name = RightBorder;
-pFrameProperties[11].Value = aEmptyBorder;
+aFrameProperties[TopBorder] = aEmptyBorder;
+aFrameProperties[BottomBorder] = aEmptyBorder;
+aFrameProperties[LeftBorder] = aEmptyBorder;
+aFrameProperties[RightBorder] = aEmptyBorder;
// Horizontal positioning
sal_Int16 nHoriOrient = text::HoriOrientation::NONE;
@@ -145,13 +134,9 @@ uno::Sequencebeans::PropertyValue
TablePositionHandler::getTablePosition() con
else if (m_aHorzAnchor == text)
nHoriOrientRelation = text::RelOrientation::FRAME;
-pFrameProperties[12].Name = HoriOrient;
-pFrameProperties[12].Value = nHoriOrient;
-pFrameProperties[13].Name = HoriOrientRelation;
-pFrameProperties[13].Value = nHoriOrientRelation;
-pFrameProperties[14].Name = HoriOrientPosition;
-pFrameProperties[14].Value = ConversionHelper::convertTwipToMM100(m_nX);
-
+aFrameProperties[HoriOrient] = nHoriOrient;
+aFrameProperties[HoriOrientRelation] = nHoriOrientRelation;
+aFrameProperties[HoriOrientPosition] =
ConversionHelper::convertTwipToMM100(m_nX);
// Vertical positioning
sal_Int16 nVertOrient = text::VertOrientation::NONE;
@@ -172,16 +157,12 @@ uno::Sequencebeans::PropertyValue
TablePositionHandler::getTablePosition() con
else if (m_aVertAnchor == text)
nVertOrientRelation = text::RelOrientation::FRAME;
-pFrameProperties[15].Name = VertOrient;
-pFrameProperties[15].Value = nVertOrient;
-pFrameProperties[16].Name = VertOrientRelation;
-pFrameProperties[16].Value = nVertOrientRelation;
-pFrameProperties[17].Name = VertOrientPosition;
-pFrameProperties[17].Value = ConversionHelper::convertTwipToMM100(m_nY);
-pFrameProperties[18].Name = FillTransparence;
-pFrameProperties[18].Value = sal_Int32(100);
+aFrameProperties[VertOrient] = nVertOrient;
+aFrameProperties[VertOrientRelation] =
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #168 from V Stuart Foote vstuart.fo...@utsa.edu --- (In reply to comment #167) I nominate bug 49514: search/find/replace has been broken for many releases when using footnotes in Writer. No. Issue of bug 49514 does not even appear valid with current 4.3.0 or 4.4.0.0alpha+ and the directional search of the reworked find bar and its navigate button. To be aMAB, the issue first needs to be confirmed and reworked with better STR and sample documents. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer2' - sc/source
sc/source/ui/view/gridwin4.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a8c6465352bfff894353765d54a434b1cf8a356c
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Jun 24 22:06:59 2014 +0100
Use output device mapping for draw layer too.
Otherwise draw layer items don't get scaled at all for tiled
rendering.
Change-Id: If65d460a83fb29b8eda692cb7c1f2bd9f7283e62
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index e3ea993b..1f771a5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -603,7 +603,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2,
SCROW nY2, ScUpdateMod
}
// define drawing layer map mode and paint rectangle
-const MapMode aDrawMode = GetDrawMapMode();
+MapMode aDrawMode = pOutDev-GetMapMode();
+aDrawMode.SetMapUnit( MAP_100TH_MM );
Rectangle aDrawingRectLogic;
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/drawview.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8d84a3bf59212a9652f76d7852c81191b8c8a3b Author: Damien Chambe damien.cha...@gmail.com Date: Sun Jun 15 21:17:41 2014 +0200 Resolves fdo#76160 Calc invalid image position on zooming Change-Id: Idd268a3378a902c173dc4d75d879714c2e919b2d Reviewed-on: https://gerrit.libreoffice.org/9792 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 63048af..77d7941 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -321,7 +321,7 @@ void ScDrawView::RecalcScale() if (nEndCol20) nEndCol = 20; if (nEndRow20) -nEndRow = 1000; +nEndRow = 20; ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY, aScaleX,aScaleY ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/InternalDataProvider.hxx | 14 +++
chart2/source/tools/InternalDataProvider.cxx | 54 +--
2 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 349132616d3bb724b43ae3fc531098369aa5be00
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jun 24 18:40:54 2014 -0400
Let's remove these lcl_ fetish.
These are not even static local functions anyway, which was what
lcl_ prefix was originally used for.
Change-Id: I0e6b6cebbcf7cdfb449cf17320fb362fc73d92a8
diff --git a/chart2/source/inc/InternalDataProvider.hxx
b/chart2/source/inc/InternalDataProvider.hxx
index 901c792..526ca2d 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -217,27 +217,27 @@ public:
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
private:
-void lcl_addDataSequenceToMap(
+void addDataSequenceToMap(
const OUString rRangeRepresentation,
const ::com::sun::star::uno::Reference
::com::sun::star::chart2::data::XDataSequence xSequence );
::com::sun::star::uno::Reference
::com::sun::star::chart2::data::XDataSequence
-lcl_createDataSequenceAndAddToMap( const OUString
rRangeRepresentation,
+createDataSequenceAndAddToMap( const OUString rRangeRepresentation,
const OUString rRole );
::com::sun::star::uno::Reference
::com::sun::star::chart2::data::XDataSequence
-lcl_createDataSequenceAndAddToMap( const OUString
rRangeRepresentation );
+createDataSequenceAndAddToMap( const OUString rRangeRepresentation );
-void lcl_deleteMapReferences( const OUString rRangeRepresentation );
+void deleteMapReferences( const OUString rRangeRepresentation );
-void lcl_adaptMapReferences(
+void adaptMapReferences(
const OUString rOldRangeRepresentation,
const OUString rNewRangeRepresentation );
-void lcl_increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
-void lcl_decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
+void increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
+void decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
typedef ::std::multimap OUString,
::com::sun::star::uno::WeakReference
::com::sun::star::chart2::data::XDataSequence
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index 7425caf..20886fa 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -411,7 +411,7 @@ InternalDataProvider::InternalDataProvider( const
InternalDataProvider rOther
InternalDataProvider::~InternalDataProvider()
{}
-void InternalDataProvider::lcl_addDataSequenceToMap(
+void InternalDataProvider::addDataSequenceToMap(
const OUString rRangeRepresentation,
const Reference chart2::data::XDataSequence xSequence )
{
@@ -421,7 +421,7 @@ void InternalDataProvider::lcl_addDataSequenceToMap(
uno::WeakReference chart2::data::XDataSequence ( xSequence )));
}
-void InternalDataProvider::lcl_deleteMapReferences( const OUString
rRangeRepresentation )
+void InternalDataProvider::deleteMapReferences( const OUString
rRangeRepresentation )
{
// set sequence to deleted by setting its range to an empty string
tSequenceMapRange aRange( m_aSequenceMap.equal_range( rRangeRepresentation
));
@@ -439,7 +439,7 @@ void InternalDataProvider::lcl_deleteMapReferences( const
OUString rRangeRepre
m_aSequenceMap.erase( aRange.first, aRange.second );
}
-void InternalDataProvider::lcl_adaptMapReferences(
+void InternalDataProvider::adaptMapReferences(
const OUString rOldRangeRepresentation,
const OUString rNewRangeRepresentation )
{
@@ -464,31 +464,31 @@ void InternalDataProvider::lcl_adaptMapReferences(
m_aSequenceMap.upper_bound(
rNewRangeRepresentation )));
}
-void InternalDataProvider::lcl_increaseMapReferences(
+void InternalDataProvider::increaseMapReferences(
sal_Int32 nBegin, sal_Int32 nEnd )
{
for( sal_Int32 nIndex = nEnd - 1; nIndex = nBegin; --nIndex )
{
-lcl_adaptMapReferences( OUString::number( nIndex ),
+adaptMapReferences( OUString::number( nIndex ),
OUString::number( nIndex + 1 ));
-lcl_adaptMapReferences( lcl_aLabelRangePrefix + OUString::number(
nIndex ),
+adaptMapReferences( lcl_aLabelRangePrefix + OUString::number( nIndex ),
lcl_aLabelRangePrefix + OUString::number( nIndex +
1 ));
}
}
-void InternalDataProvider::lcl_decreaseMapReferences(
+void InternalDataProvider::decreaseMapReferences(
sal_Int32 nBegin, sal_Int32 nEnd )
{
for( sal_Int32 nIndex
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DataBrowserModel.cxx | 323 +-
1 file changed, 163 insertions(+), 160 deletions(-)
New commits:
commit 3a7f55924b6901e555621e662cbc4e112396dfb9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jun 24 19:02:47 2014 -0400
Reduce indentation levels.
Change-Id: I5de3dea88a1e6f36c995697ba648ce6b82f4e8ae
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 3ff0dbc..27fedf8 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -311,110 +311,113 @@ void DataBrowserModel::insertDataSeries( sal_Int32
nAfterColumnIndex )
OSL_ASSERT( m_apDialogModel.get());
Reference chart2::XInternalDataProvider xDataProvider(
m_apDialogModel-getDataProvider(), uno::UNO_QUERY );
-if( xDataProvider.is())
+
+if (!xDataProvider.is())
+return;
+
+if( isCategoriesColumn(nAfterColumnIndex) )
+nAfterColumnIndex = getCategoryColumnCount()-1;
+
+sal_Int32 nStartCol = 0;
+Reference chart2::XDiagram xDiagram( ChartModelHelper::findDiagram(
m_xChartDocument ));
+Reference chart2::XChartType xChartType;
+Reference chart2::XDataSeries xSeries;
+if( static_cast tDataColumnVector::size_type ( nAfterColumnIndex ) =
m_aColumns.size())
+xSeries.set( m_aColumns[nAfterColumnIndex].m_xDataSeries );
+
+sal_Int32 nSeriesNumberFormat = 0;
+if( xSeries.is())
+{
+xChartType.set( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries
));
+tDataHeaderVector::const_iterator aIt(
+::std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
+lcl_DataSeriesOfHeaderMatches( xSeries )));
+if( aIt != m_aHeaders.end())
+nStartCol = aIt-m_nEndColumn;
+
+Reference beans::XPropertySet xSeriesProps( xSeries, uno::UNO_QUERY
);
+if( xSeriesProps.is() )
+xSeriesProps-getPropertyValue(CHART_UNONAME_NUMFMT) =
nSeriesNumberFormat;
+}
+else
{
-if( isCategoriesColumn(nAfterColumnIndex) )
-nAfterColumnIndex = getCategoryColumnCount()-1;
+xChartType.set( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ));
+nStartCol = nAfterColumnIndex;
+}
+
+if (!xChartType.is())
+return;
-sal_Int32 nStartCol = 0;
-Reference chart2::XDiagram xDiagram( ChartModelHelper::findDiagram(
m_xChartDocument ));
-Reference chart2::XChartType xChartType;
-Reference chart2::XDataSeries xSeries;
-if( static_cast tDataColumnVector::size_type ( nAfterColumnIndex )
= m_aColumns.size())
-xSeries.set( m_aColumns[nAfterColumnIndex].m_xDataSeries );
+sal_Int32 nOffset = 0;
+if( xDiagram.is() lcl_ShowCategories( xDiagram ))
+nOffset=getCategoryColumnCount();
-sal_Int32 nSeriesNumberFormat = 0;
-if( xSeries.is())
-{
-xChartType.set( DiagramHelper::getChartTypeOfSeries( xDiagram,
xSeries ));
-tDataHeaderVector::const_iterator aIt(
-::std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
-lcl_DataSeriesOfHeaderMatches( xSeries )));
-if( aIt != m_aHeaders.end())
-nStartCol = aIt-m_nEndColumn;
-
-Reference beans::XPropertySet xSeriesProps( xSeries,
uno::UNO_QUERY );
-if( xSeriesProps.is() )
-xSeriesProps-getPropertyValue(CHART_UNONAME_NUMFMT) =
nSeriesNumberFormat;
-}
-else
-{
-xChartType.set( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ));
-nStartCol = nAfterColumnIndex;
-}
+// get shared sequences of current series
+Reference chart2::XDataSeriesContainer xSeriesCnt( xChartType,
uno::UNO_QUERY );
+lcl_tSharedSeqVec aSharedSequences;
+if( xSeriesCnt.is())
+aSharedSequences = lcl_getSharedSequences(
xSeriesCnt-getDataSeries());
+
+Referencechart2::XDataSeries xNewSeries =
+m_apDialogModel-insertSeriesAfter(xSeries, xChartType, true);
-if( xChartType.is())
+if (!xNewSeries.is())
+return;
+
+Reference chart2::data::XDataSource xSource( xNewSeries, uno::UNO_QUERY
);
+if (xSource.is())
+{
+Sequence Reference chart2::data::XLabeledDataSequence
aLSequences(
+xSource-getDataSequences());
+sal_Int32 nSeqIdx = 0;
+sal_Int32 nSeqSize = aLSequences.getLength();
+nStartCol -= (nOffset - 1);
+for( sal_Int32 nIndex = nStartCol;
+ (nSeqIdx nSeqSize);
+ ++nSeqIdx )
{
-sal_Int32 nOffset = 0;
-if( xDiagram.is() lcl_ShowCategories( xDiagram ))
-nOffset=getCategoryColumnCount();
-// get shared sequences of current series
-Reference
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav-neon/webdavcontent.hxx |1 +
ucb/source/ucp/webdav/SerfSession.cxx|1 +
ucb/source/ucp/webdav/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav/webdavcontent.hxx |1 +
5 files changed, 15 insertions(+)
New commits:
commit 8b0b55adb3196d1833146497b01da2c0e7c45e87
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 16:22:51 2014 +0200
fdo#72157: webdav: Release WebDAV file lock on document close.
Make it work with both serf and neon version.
Change-Id: I3c74ba57cde19f4417d0229c1c809756e3c5f9f8
(cherry picked from commit 956d088db5850e9a096bb9abd8b3e446e096f613)
Reviewed-on: https://gerrit.libreoffice.org/9880
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index ff1b86c..a5ffa0d 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -112,6 +112,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -144,6 +145,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -164,6 +166,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
@@ -2818,6 +2822,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -2847,6 +2852,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 7e9c851..8073c1f 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -91,6 +91,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool m_bLocked;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector OUString m_aFailedPropNames;
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index eea9644..a33b0a9 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1103,6 +1103,7 @@ void SerfSession::UNLOCK( const OUString inPath,
{
HandleError( aReqProc );
SAL_INFO(ucb.ucp.webdav, UNLOCK of inPath succeeded. );
+apr_environment::AprEnv::getAprEnv()-getSerfLockStore()-removeLock(
inPath );
}
catch(...)
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index cf1a55e6..cd416cc 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -207,6 +207,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -239,6 +240,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -259,6 +261,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
@@ -2946,6 +2950,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -2973,6 +2978,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index f9daf3d..daa948c 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -82,6 +82,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - ucb/source
ucb/source/ucp/webdav-neon/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav-neon/webdavcontent.hxx |1 +
ucb/source/ucp/webdav/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav/webdavcontent.hxx |1 +
4 files changed, 14 insertions(+)
New commits:
commit de5de7e1116fad18c8e3eef110eb32f2c75550ca
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Jun 24 16:22:51 2014 +0200
fdo#72157: webdav: Release WebDAV file lock on document close.
Only neon version is relevant in this branch (libreoffice-4-2).
(cherry picked from commit 956d088db5850e9a096bb9abd8b3e446e096f613)
Conflicts:
ucb/source/ucp/webdav/SerfSession.cxx
Change-Id: I3c74ba57cde19f4417d0229c1c809756e3c5f9f8
Reviewed-on: https://gerrit.libreoffice.org/9881
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index bff41ad..ce2fcbb 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -112,6 +112,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -144,6 +145,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -164,6 +166,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
//=
@@ -2818,6 +2822,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -2847,6 +2852,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index f2d378b..ee46d6d 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -91,6 +91,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool m_bLocked;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector OUString m_aFailedPropNames;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index d98c39b..941bef6 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -208,6 +208,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( false ),
+ m_bLocked( false ),
m_bCollection( false ),
m_bDidGetOrHead( false )
{
@@ -240,6 +241,7 @@ Content::Content(
m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
m_bTransient( true ),
+ m_bLocked( false ),
m_bCollection( isCollection ),
m_bDidGetOrHead( false )
{
@@ -260,6 +262,8 @@ Content::Content(
// virtual
Content::~Content()
{
+if (m_bLocked)
+unlock(uno::Reference ucb::XCommandEnvironment ());
}
//=
@@ -2983,6 +2987,7 @@ void Content::lock(
uno::Sequence OUString () );
xResAccess-LOCK( aLock, Environment );
+m_bLocked = true;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
@@ -3010,6 +3015,7 @@ void Content::unlock(
}
xResAccess-UNLOCK( Environment );
+m_bLocked = false;
{
osl::Guard osl::Mutex aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index 10c3022..a301983 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -82,6 +82,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceType;
ContentProvider* m_pProvider; // No need for a ref, base class holds
object
bool m_bTransient;
+bool m_bLocked;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector OUString m_aFailedPropNames;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/fmshimp.cxx | 10 --
svx/source/gallery2/codec.cxx| 17 -
svx/source/gallery2/galbrws1.cxx | 10 --
svx/source/gallery2/galbrws2.cxx |4 ++--
svx/source/gallery2/galini.cxx |6 +++---
svx/source/gallery2/gallery1.cxx |9 -
svx/source/gallery2/galmisc.cxx |5 ++---
svx/source/gallery2/galobj.cxx |6 +++---
8 files changed, 30 insertions(+), 37 deletions(-)
New commits:
commit e32b78ebfd9dc6f780e73d17c794c54828471895
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jun 24 13:43:40 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I1a566a870a3bde91a527ac454fc9946e99a2593e
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 73f2f17..5c051c3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1600,9 +1600,9 @@ void FmXFormShell::ExecuteSearch()
// ausgeraeumt sind, sollte hier ein SM_USETHREAD rein, denn die Suche in
einem eigenen Thread ist doch etwas fluessiger
// sollte allerdings irgendwie von dem unterliegenden Cursor abhaengig
gemacht werden, DAO zum Beispiel ist nicht thread-sicher
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-AbstractFmSearchDialog* pDialog = NULL;
+boost::scoped_ptrAbstractFmSearchDialog pDialog;
if ( pFact )
-pDialog = pFact-CreateFmSearchDialog(
m_pShell-GetViewShell()-GetViewFrame()-GetWindow(), strInitialText,
aContextNames, nInitialContext, LINK( this, FmXFormShell,
OnSearchContextRequest ) );
+pDialog.reset(pFact-CreateFmSearchDialog(
m_pShell-GetViewShell()-GetViewFrame()-GetWindow(), strInitialText,
aContextNames, nInitialContext, LINK( this, FmXFormShell,
OnSearchContextRequest ) ));
DBG_ASSERT( pDialog, FmXFormShell::ExecuteSearch: could not create the
search dialog! );
if ( pDialog )
{
@@ -1610,7 +1610,7 @@ void FmXFormShell::ExecuteSearch()
pDialog-SetFoundHandler( LINK( this, FmXFormShell, OnFoundData ) );
pDialog-SetCanceledNotFoundHdl( LINK( this, FmXFormShell,
OnCanceledNotFound ) );
pDialog-Execute();
-delete pDialog;
+pDialog.reset();
}
// GridControls wieder restaurieren
@@ -4101,7 +4101,7 @@ void
ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
{
// We can't simply re-insert the item because we have a clear
order for all the our items.
// So first we have to determine the position of the item to
insert.
-PopupMenu* pSource = FmXFormShell::GetConversionMenu();
+boost::scoped_ptrPopupMenu
pSource(FmXFormShell::GetConversionMenu());
sal_uInt16 nSourcePos = pSource-GetItemPos(nSID);
DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND,
ControlConversionMenuController::StateChanged : FmXFormShell supplied an
invalid menu !);
sal_uInt16 nPrevInSource = nSourcePos;
@@ -4122,8 +4122,6 @@ void
ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
pSource-GetItemBits(nSID), OString(), ++nPrevInConversion);
m_pConversionMenu-SetItemImage(nSID, pSource-GetItemImage(nSID));
m_pConversionMenu-SetHelpId(nSID, pSource-GetHelpId(nSID));
-
-delete pSource;
}
m_pMainMenu-EnableItem(SID_FM_CHANGECONTROLTYPE,
m_pConversionMenu-GetItemCount() 0);
}
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 8d3264e3..3ef8f15 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -22,6 +22,7 @@
#include tools/zcodec.hxx
#include tools/debug.hxx
#include codec.hxx
+#include boost/scoped_array.hpp
// - GalleryCodec -
@@ -98,11 +99,12 @@ void GalleryCodec::Read( SvStream rStmToRead )
// decompress
if( 1 == nVersion )
{
-sal_uInt8* pCompressedBuffer = new sal_uInt8[ nCompressedSize ];
rStm.Read( pCompressedBuffer, nCompressedSize );
-sal_uInt8* pInBuf = pCompressedBuffer;
-sal_uInt8* pOutBuf = new sal_uInt8[ nUnCompressedSize ];
-sal_uInt8* pTmpBuf = pOutBuf;
-sal_uInt8* pLast = pOutBuf + nUnCompressedSize - 1;
+boost::scoped_arraysal_uInt8 pCompressedBuffer(new sal_uInt8[
nCompressedSize ]);
+rStm.Read( pCompressedBuffer.get(), nCompressedSize );
+sal_uInt8* pInBuf = pCompressedBuffer.get();
+boost::scoped_arraysal_uInt8 pOutBuf(new sal_uInt8[
nUnCompressedSize ]);
+sal_uInt8* pTmpBuf = pOutBuf.get();
+sal_uInt8* pLast = pOutBuf.get() + nUnCompressedSize - 1;
sal_uIntPtr nIndex = 0UL, nCountByte, nRunByte;
boolbEndDecoding = false;
@@ -138,10 +140,7 @@ void GalleryCodec::Read( SvStream rStmToRead )
}
while ( !bEndDecoding ( pTmpBuf = pLast ) );
-
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/dialogs/DataBrowserModel.cxx | 46 +++--
chart2/source/controller/dialogs/DialogModel.cxx | 47 --
2 files changed, 62 insertions(+), 31 deletions(-)
New commits:
commit 3f9275bd262dd8a7cfc199ad858208b8e400f6d9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jun 24 21:05:41 2014 -0400
Annotate the code a little more, to make it easier to follow.
Change-Id: Iefc61fdc132a18e73b0136f0248d69ab9e07a5e8
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 6e0e6c7..87c916e 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -316,31 +316,39 @@ void DataBrowserModel::insertDataSeries( sal_Int32
nAfterColumnIndex )
return;
if( isCategoriesColumn(nAfterColumnIndex) )
+// Move to the last category column.
nAfterColumnIndex = getCategoryColumnCount()-1;
sal_Int32 nStartCol = 0;
-Reference chart2::XDiagram xDiagram( ChartModelHelper::findDiagram(
m_xChartDocument ));
-Reference chart2::XChartType xChartType;
-Reference chart2::XDataSeries xSeries;
-if( static_cast tDataColumnVector::size_type ( nAfterColumnIndex ) =
m_aColumns.size())
+Referencechart2::XDiagram xDiagram =
ChartModelHelper::findDiagram(m_xChartDocument);
+Referencechart2::XChartType xChartType;
+Referencechart2::XDataSeries xSeries;
+if (static_castsize_t(nAfterColumnIndex) m_aColumns.size())
+// Get the data series at specific column position (if available).
xSeries.set( m_aColumns[nAfterColumnIndex].m_xDataSeries );
sal_Int32 nSeriesNumberFormat = 0;
if( xSeries.is())
{
+// Use the chart type of the currently selected data series.
xChartType.set( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries
));
+
+// Find the corresponding header and determine the last column of this
+// data series.
tDataHeaderVector::const_iterator aIt(
::std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
lcl_DataSeriesOfHeaderMatches( xSeries )));
if( aIt != m_aHeaders.end())
nStartCol = aIt-m_nEndColumn;
+// Get the number format too.
Reference beans::XPropertySet xSeriesProps( xSeries, uno::UNO_QUERY
);
if( xSeriesProps.is() )
xSeriesProps-getPropertyValue(CHART_UNONAME_NUMFMT) =
nSeriesNumberFormat;
}
else
{
+// No data series at specified column position. Use the first chart
type.
xChartType.set( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ));
nStartCol = nAfterColumnIndex;
}
@@ -350,9 +358,10 @@ void DataBrowserModel::insertDataSeries( sal_Int32
nAfterColumnIndex )
sal_Int32 nOffset = 0;
if( xDiagram.is() lcl_ShowCategories( xDiagram ))
-nOffset=getCategoryColumnCount();
+nOffset = getCategoryColumnCount();
-// get shared sequences of current series
+// Get shared sequences of current series. Normally multiple data series
+// only share values-x sequences. (TODO: simplify this logic).
Reference chart2::XDataSeriesContainer xSeriesCnt( xChartType,
uno::UNO_QUERY );
lcl_tSharedSeqVec aSharedSequences;
if( xSeriesCnt.is())
@@ -362,30 +371,31 @@ void DataBrowserModel::insertDataSeries( sal_Int32
nAfterColumnIndex )
m_apDialogModel-insertSeriesAfter(xSeries, xChartType, true);
if (!xNewSeries.is())
+// Failed to insert new data series to the model. Bail out.
return;
Reference chart2::data::XDataSource xSource( xNewSeries, uno::UNO_QUERY
);
if (xSource.is())
{
-Sequence Reference chart2::data::XLabeledDataSequence
aLSequences(
-xSource-getDataSequences());
+SequenceReferencechart2::data::XLabeledDataSequence aLSequences =
xSource-getDataSequences();
sal_Int32 nSeqIdx = 0;
sal_Int32 nSeqSize = aLSequences.getLength();
-nStartCol -= (nOffset - 1);
-for( sal_Int32 nIndex = nStartCol;
- (nSeqIdx nSeqSize);
- ++nSeqIdx )
+nStartCol -= (nOffset - 1); // ???
+for (sal_Int32 nIndex = nStartCol; nSeqIdx nSeqSize; ++nSeqIdx)
{
lcl_tSharedSeqVec::const_iterator aSharedIt(
::std::find_if( aSharedSequences.begin(),
aSharedSequences.end(),
lcl_RolesOfLSeqMatch( aLSequences[nSeqIdx] )));
+
if( aSharedIt != aSharedSequences.end())
{
+// Shared sequence. Most likely values-x sequence. Copy it
from existing sequence.
aLSequences[nSeqIdx]-setValues( (*aSharedIt)-getValues());
aLSequences[nSeqIdx]-setLabel( (*aSharedIt)-getLabel());
}
else
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DataBrowserModel.cxx | 26 ++
chart2/source/inc/DataSeriesHelper.hxx|5 +--
chart2/source/tools/DataSeriesHelper.cxx |2 -
chart2/source/tools/DataSourceHelper.cxx |2 -
4 files changed, 13 insertions(+), 22 deletions(-)
New commits:
commit 9af5c13851482e95ff17f7cf4a46a5660f8588af
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jun 24 22:02:24 2014 -0400
Re-use DataSeriesHelper::getRole().
Change-Id: Ia880bc03400d4cbf4c3033e01affafccc0a384fb
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 87c916e..15e0cdd 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -33,6 +33,7 @@
#include ChartModel.hxx
#include unonames.hxx
+#include DataSeriesHelper.hxx
#include com/sun/star/container/XIndexReplace.hpp
#include com/sun/star/chart2/XAxis.hpp
@@ -81,19 +82,10 @@ OUString lcl_getRole(
return aResult;
}
-OUString lcl_getRole(
-const Reference chart2::data::XLabeledDataSequence xLSeq )
-{
-OUString aResult;
-if( xLSeq.is())
-aResult = lcl_getRole( xLSeq-getValues());
-return aResult;
-}
-
OUString lcl_getUIRoleName(
const Reference chart2::data::XLabeledDataSequence xLSeq )
{
-OUString aResult( lcl_getRole( xLSeq ));
+OUString aResult = ::chart::DataSeriesHelper::getRole(xLSeq);
if( !aResult.isEmpty())
aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult );
return aResult;
@@ -123,7 +115,7 @@ bool lcl_SequenceOfSeriesIsShared(
Sequence Reference chart2::data::XLabeledDataSequence aLSeq(
xSource-getDataSequences());
for( sal_Int32 i=0; iaLSeq.getLength(); ++i )
if( aLSeq[i].is()
-lcl_getRole( aLSeq[i] ).equals( aValuesRole ))
+::chart::DataSeriesHelper::getRole(aLSeq[i]).equals(
aValuesRole ))
{
// getValues().is(), because lcl_getRole checked that already
bResult = (aValuesRep ==
aLSeq[i]-getValues()-getSourceRangeRepresentation());
@@ -204,11 +196,11 @@ private:
struct lcl_RolesOfLSeqMatch : public ::std::unary_function Reference
chart2::data::XLabeledDataSequence , bool
{
lcl_RolesOfLSeqMatch( const Reference chart2::data::XLabeledDataSequence
xLSeq ) :
-m_aRole( lcl_getRole( xLSeq ))
-{}
+m_aRole(::chart::DataSeriesHelper::getRole(xLSeq)) {}
+
bool operator() ( const Reference chart2::data::XLabeledDataSequence
xLSeq )
{
-return lcl_getRole( xLSeq ).equals( m_aRole );
+return ::chart::DataSeriesHelper::getRole(xLSeq).equals(m_aRole);
}
private:
OUString m_aRole;
@@ -269,8 +261,8 @@ struct DataBrowserModel::implColumnLess : public
::std::binary_function
{
if( rLeft.m_xLabeledDataSequence.is()
rRight.m_xLabeledDataSequence.is())
{
-return DialogModel::GetRoleIndexForSorting( lcl_getRole(
rLeft.m_xLabeledDataSequence ))
-DialogModel::GetRoleIndexForSorting( lcl_getRole(
rRight.m_xLabeledDataSequence ));
+return
DialogModel::GetRoleIndexForSorting(DataSeriesHelper::getRole(rLeft.m_xLabeledDataSequence))
+
DialogModel::GetRoleIndexForSorting(DataSeriesHelper::getRole(rRight.m_xLabeledDataSequence));
}
return true;
}
@@ -885,7 +877,7 @@ void DataBrowserModel::updateFromModel()
for( ; nSeqIdxaLSeqs.getLength(); ++nSeqIdx )
{
sal_Int32 nSequenceNumberFormatKey =
nYAxisNumberFormatKey;
-OUString aRole = lcl_getRole( aLSeqs[nSeqIdx] );
+OUString aRole =
DataSeriesHelper::getRole(aLSeqs[nSeqIdx]);
if( aRole.equals( aRoleForDataLabelNumberFormat ) )
{
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 2755d3b..9792b71 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -39,9 +39,8 @@ namespace chart
namespace DataSeriesHelper
{
-OUString GetRole(
-const ::com::sun::star::uno::Reference
-::com::sun::star::chart2::data::XLabeledDataSequence
xLabeledDataSequence );
+OOO_DLLPUBLIC_CHARTTOOLS OUString
+getRole( const
css::uno::Referencecss::chart2::data::XLabeledDataSequence
xLabeledDataSequence );
/** Retrieves the data sequence in the given data source that matches the
given role. If more than one sequences match the role, the first match
diff --git a/chart2/source/tools/DataSeriesHelper.cxx
b/chart2/source/tools/DataSeriesHelper.cxx
index 11c6dd0..a3b6cd5 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++
Re: Access2Base - New release
On Tue, Jun 17, 2014 at 10:05 AM, David Tardon dtar...@redhat.com wrote: IMHO there are just two alternatives: Either the code is ours, in which case it should be an optional component and should only be updated together with libreoffice. Or it is external, in which case the sources should not be duplicated in our repo, but the project should be treated as another one of the dozen extensions we allow to bundle. That means, download the .oxt during build, unpack it, put it to instdir and be done with it. (This is directly supported by gbuild, using gb_ExtensionPackageSet). FWIW, after reading this thread, I concurs with the above. The current expressed 'problem' seems a self inflicted wound, due to wanting to become 'a core part of Libreoffice' while not wanting to follow the consequences associated with that status. Norbert --- Tu ne peux pas avoir le beurre, l'argent du beurre (et la cremiere) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Hideki Ikeda license statement
Hi All, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, Hideki Ikeda ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |1 + 1 file changed, 1 insertion(+) New commits: commit efd9abb3aedaf361a7fed343cbcb535aef32a839 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Jun 25 07:27:04 2014 +0200 loplugin:sallogareas Change-Id: Ia5fbdfd83971ac946de6d022be55d5a286a1bf5a diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 2fe2c91..1627ad2 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -410,6 +410,7 @@ certain functionality. @li @c sw.filter @li @c sw.idle @li @c sw.level2 +@li @c sw.mailmerge - Writer mail merge @li @c sw.rtf - .rtf export filter @li @c sw.tiled @li @c sw.ui ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] [libreoffice-l10n] Re: [ANN] LIbreOffice 4.2.5 RC2 available
On Sat, Jun 21, 2014 at 4:56 AM, Jay Philips philip...@hotmail.com wrote: I assume 4.2 cant become stable until 4.3 becomes fresh. :) IMHO naming the oldstable series stable was a mistake, as it's misleading and confusing. A much better name for that series would be mature. That way, both fresh and mature would be considered stable software by the public. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] BugZilla enhancemnet suggestion
Cor Nouws wrote I know, since I am part of the battle against a considerable workload caused by duplicate issues and 'help-requests' (thanks to BSA..). Hence my suggestion: in a reported bug, add a button that starts a query based on the summary of that issue, not necessarily the component, and that opens the result in a new tab. Makes finding duplicates much faster. Hi! If you submit the bug in Bugzilla directly, there is Potential duplicates table visible, with issues real-time queried based on as you type summary. Implementing this in BSA would help to avoid duplicates... Best regards. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-BugZilla-enhancemnet-suggestion-tp4113267p4113542.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 80223] LibO Can't Print
https://bugs.freedesktop.org/show_bug.cgi?id=80223 --- Comment #7 from Asger Hansen a...@1957ab.dk --- Hi again. If I use PDFill, Microsoft XPS Document Writer and CutePDF Writer,in 4.3.0.1 rc, the LibO print the first page and then LibO do a restart again. If I use 4.2.5.2, I don't have any printer problems. Is there a log file in LibO, and can I send it to You ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80318] Non-page background not repainted when comment deletion reduces number of pages
https://bugs.freedesktop.org/show_bug.cgi?id=80318 --- Comment #4 from Eyal Rozenberg eyal...@technion.ac.il --- Ummm, I meant to say rejecting the changes, so that the number of pages decreases by one. Sorry. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80318] Non-page background not repainted when comment deletion reduces number of pages
https://bugs.freedesktop.org/show_bug.cgi?id=80318 --- Comment #5 from Eyal Rozenberg eyal...@technion.ac.il --- Hmm, but I can't really get it to work. What I was working on had many interspersed changes but 2 authors, as well as comments, including comments marked deleted. Probably the repaint had something to do with the comments disappearing. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80407] FILESAVE: Validity check on a column for list of values is lost on saving as .xlsx
https://bugs.freedesktop.org/show_bug.cgi?id=80407 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from ign_christian ign_christ...@yahoo.com --- Suokunlong, it looks duplicate to Bug 67146. It's been broken since old time. *** This bug has been marked as a duplicate of bug 67146 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67146] Other: Validation is removed past last cell that has data in column that has validation (XLSX)
https://bugs.freedesktop.org/show_bug.cgi?id=67146 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||r...@trw.org.uk --- Comment #3 from ign_christian ign_christ...@yahoo.com --- *** Bug 80407 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56823] Saving in MS Office formats loses data range
https://bugs.freedesktop.org/show_bug.cgi?id=56823 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from ign_christian ign_christ...@yahoo.com --- *** This bug has been marked as a duplicate of bug 41425 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41425] No Data Validation in Saved XLS
https://bugs.freedesktop.org/show_bug.cgi?id=41425 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||llsub...@zudiewiener.com --- Comment #6 from ign_christian ign_christ...@yahoo.com --- *** Bug 56823 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80407] FILESAVE: Validity check on a column for list of values is lost on saving as .xlsx
https://bugs.freedesktop.org/show_bug.cgi?id=80407 Jay Philips philip...@hotmail.com changed: What|Removed |Added CC||philip...@hotmail.com --- Comment #5 from Jay Philips philip...@hotmail.com --- (In reply to comment #3) Created attachment 101635 [details] test ods file with vadility list in column A. Tested the file in 3.3.0, 4.1.6 and 4.2.5 and all loose the validity in column A. Saving as xls also has the same effect, but saving as MSO 2003 xml looses it even in A1. I believe that this example file might not be what Riq was referring to, as i added number values in A1 to A10 and the validity check remained after saving it to xlsx. So Riq please send us a sample file to test against. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80458] Other: Chart - XY - Lines only - X Axis - Major Interval : doesn't save my edit
https://bugs.freedesktop.org/show_bug.cgi?id=80458 Joel Madero jmadero@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||jmadero@gmail.com Ever confirmed|0 |1 --- Comment #1 from Joel Madero jmadero@gmail.com --- Please attach the actual sheet. Also provide clearer steps on how to reproduce - ie. how did you get to those dialogs that you're looking at. When reporting bug it's always better to me more thorough than less thorough just to make QA's job easier. If we can follow step by step it can cut down the time dramatically for us to confirm the issue and move it forward to get resolved. Moving to NEEDINFO - once you provide a test sheet and reproducible steps please put it back in UNCONFIRMED status. Thanks -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41425] No Data Validation in Saved XLS
https://bugs.freedesktop.org/show_bug.cgi?id=41425 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Hardware|x86-64 (AMD64) |All OS|Linux (All) |All Version|3.6.2.2 release |3.5.4 release --- Comment #7 from ign_christian ign_christ...@yahoo.com --- Change Version to 3.5.4 - based on Bug 56823 Platform All -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67146] Other: Validation is removed past last cell that has data in column that has validation (XLSX)
https://bugs.freedesktop.org/show_bug.cgi?id=67146 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added OS|Linux (All) |All See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=41425 Version|4.0.2.2 release |3.5.4 release --- Comment #4 from ign_christian ign_christ...@yahoo.com --- Change Version to 3.5.4 - based on Bug 56823 Platform All For XLS : Bug 41425 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41425] No Data Validation in Saved XLS
https://bugs.freedesktop.org/show_bug.cgi?id=41425 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=67146 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
