[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||75137 -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|75137 | -- 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: vcl/inc
vcl/inc/headless/svpgdi.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit c9271bd507e0eb9dd33e6f366479aad8b505a3e0
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Nov 30 18:49:24 2014 +1100
vcl: remove IOS/OSX only code
Change-Id: I83fd835a8a198ff469cfaa0441c938acf9433862
Reviewed-on: https://gerrit.libreoffice.org/13206
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 23b76ca..39f8176 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -202,8 +202,6 @@ public:
virtual voidBeginPaint() SAL_OVERRIDE { };
virtual voidEndPaint() SAL_OVERRIDE { };
-
-voidSetVirDevGraphics( CGLayerRef xLayer, CGContextRef
xContext, int = 0 );
};
#endif
___
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/undo/unbkmk.cxx | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 43a803ccf8d392561bd168dc3b64695c4dcf93ce
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 26 21:26:06 2014 +0100
Use IDocumentMarkAccess::findMark here
Presumably, the names should be unique, so it's the same.
Change-Id: I74907b97bc25f9512d4f7514162360e8b21ad4a5
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index eb11aa9..3501ed5 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -118,17 +118,10 @@ SwRewriter SwUndoRenameBookmark::GetRewriter() const
void SwUndoRenameBookmark::Rename(::sw::UndoRedoContext rContext, const
OUString sFrom, const OUString sTo)
{
IDocumentMarkAccess* const pMarkAccess =
rContext.GetDoc().getIDocumentMarkAccess();
-for ( IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess-getAllMarksBegin();
- ppBkmk != pMarkAccess-getAllMarksEnd();
- ++ppBkmk )
+IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess-findMark(sFrom);
+if (ppBkmk != pMarkAccess-getAllMarksEnd())
{
-if ( m_nNode == ppBkmk-get()-GetMarkPos().nNode.GetIndex()
- m_nCntnt == ppBkmk-get()-GetMarkPos().nContent.GetIndex()
- sFrom == ppBkmk-get()-GetName() )
-{
-pMarkAccess-renameMark( ppBkmk-get(), sTo );
-break;
-}
+pMarkAccess-renameMark( ppBkmk-get(), sTo );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - sw/qa unusedcode.easy writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
sw/qa/extras/rtfimport/data/fdo72031.rtf |1
sw/qa/extras/rtfimport/rtfimport.cxx |9
unusedcode.easy |1
writerfilter/CppunitTest_writerfilter_misc.mk|1
writerfilter/Library_writerfilter.mk |1
writerfilter/inc/resourcemodel/TableManager.hxx | 1148 ---
writerfilter/inc/resourcemodel/TagLogger.hxx |3
writerfilter/source/dmapper/DomainMapperTableHandler.hxx |2
writerfilter/source/dmapper/DomainMapperTableManager.cxx |8
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 12
writerfilter/source/dmapper/DomainMapper_Impl.hxx|1
writerfilter/source/dmapper/TableManager.cxx | 500 ++
writerfilter/source/dmapper/TableManager.hxx | 641
writerfilter/source/dmapper/TablePropertiesHandler.hxx |9
writerfilter/source/resourcemodel/TagLogger.cxx | 11
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 105 -
writerfilter/source/rtftok/rtfsdrimport.cxx |2
writerfilter/source/rtftok/rtfsprm.cxx |6
writerfilter/source/rtftok/rtfsprm.hxx | 10
19 files changed, 1224 insertions(+), 1247 deletions(-)
New commits:
commit 61672791db2fa5650b7021639bcaacfc534c75b5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Nov 29 15:40:58 2014 +0100
Avoid having TableManager as a template class
It was always used with T=css::uno::Referencecss::text::XTextRange
Change-Id: If79413cf68ad5d5f6fc7aba1c065f49e5781d71d
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 3ce1dd7..df2d1e1 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -101,6 +101,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/SettingsTable \
writerfilter/source/dmapper/StyleSheetTable \
writerfilter/source/dmapper/TDefTableHandler \
+writerfilter/source/dmapper/TableManager \
writerfilter/source/dmapper/TablePositionHandler \
writerfilter/source/dmapper/TablePropertiesHandler \
writerfilter/source/dmapper/TextEffectsHandler \
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 1085a94..58771ca 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -133,7 +133,7 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
dmapper_logger-chars(sSprm);
dmapper_logger-endElement();
#endif
-bool bRet = DomainMapperTableManager_Base_t::sprm(rSprm);
+bool bRet = TableManager::sprm(rSprm);
if( !bRet )
{
bRet = m_pTablePropsHandler-sprm( rSprm );
@@ -521,7 +521,7 @@ void DomainMapperTableManager::setIsInShape(bool bIsInShape)
void DomainMapperTableManager::startLevel( )
{
-DomainMapperTableManager_Base_t::startLevel( );
+TableManager::startLevel( );
// If requested, pop the value that was pushed too early.
boost::optionalsal_Int32 oCurrentWidth;
@@ -576,7 +576,7 @@ void DomainMapperTableManager::endLevel( )
m_aTmpPosition.pop_back( );
m_aTmpTableProperties.pop_back( );
-DomainMapperTableManager_Base_t::endLevel( );
+TableManager::endLevel( );
#ifdef DEBUG_WRITERFILTER
dmapper_logger-startElement(dmappertablemanager.endLevel);
PropertyMapPtr pProps = getTableProps();
@@ -826,7 +826,7 @@ void DomainMapperTableManager::endOfRowAction()
}
// Now that potentially opened table is closed, save the table properties
-DomainMapperTableManager_Base_t::insertTableProps( pTmpTableProperties );
+TableManager::insertTableProps( pTmpTableProperties );
m_aTmpTableProperties.pop_back();
TablePropertyMapPtr pEmptyTableProps( new TablePropertyMap() );
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 599c432..6333c3b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -34,7 +34,7 @@ namespace dmapper {
class DomainMapper;
-class DomainMapperTableManager : public DomainMapperTableManager_Base_t
+class DomainMapperTableManager : public TableManager
{
typedef boost::shared_ptr std::vectorsal_Int32 IntVectorPtr;
@@ -111,7 +111,7 @@ public:
if ( m_pStyleProps.get( ) )
m_pStyleProps-InsertProps(pProps);
else
- DomainMapperTableManager_Base_t::cellProps( pProps );
+ TableManager::cellProps( pProps );
};
virtual void cellPropsByCell(unsigned int i, TablePropertyMapPtr pProps)
SAL_OVERRIDE
@@ -119,7 +119,7 @@ public:
if ( m_pStyleProps.get( ) )
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletoolbox.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit ef8e38266b13800518830917a71dde4d3ee8f7ef
Author: Maxim Monastirsky momonas...@gmail.com
Date: Fri Nov 28 13:59:38 2014 +0200
fdo#86117 a11y: Exception when closing popup from ToolBox w/o separator
For some reason PopupWindowControllerImpl::WindowEventListener is getting
the VCLEVENT_WINDOW_HIDE event twice, and while processing the second one
the ToolBox no longer has an active down item, which results in a
IndexOutOfBoundsException in VCLXAccessibleToolBox::getAccessibleChild,
because ToolBox::GetItemPos(0) correctly returns TOOLBOX_ITEM_NOTFOUND.
But when a ToolBox has at least one separator, ToolBox::GetItemPos(0)
detects its position as the current down item, and no exception is
thrown.
Probably it just hides the bug, because it seems to me that getting
the hide event twice is the real bug here.
Change-Id: If018350dd91cd959c0c8f7d6859474f95fb8cd1e
Reviewed-on: https://gerrit.libreoffice.org/13173
Reviewed-by: Maxim Monastirsky momonas...@gmail.com
Tested-by: Maxim Monastirsky momonas...@gmail.com
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 188e777..c3042fb 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -430,10 +430,16 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl(
vcl::Window* pWindow, b
ToolBox* pToolBox = static_cast ToolBox* ( GetWindow() );
if( pWindow pToolBox )
{
+const sal_uInt16 nDownItem = pToolBox-GetDownItemId();
+if ( !nDownItem )
+// Items with ItemId == 0 are not allowed in ToolBox, which means
that currently no item is in down state.
+// Moreover, running GetItemPos with 0 could find a separator item
if there is any.
+return;
+
Reference XAccessible xChild( pWindow-GetAccessible() );
if( xChild.is() )
{
-Reference XAccessible xChildItem( getAccessibleChild(
static_cast sal_Int32 ( pToolBox-GetItemPos( pToolBox-GetDownItemId() ) ) )
);
+Reference XAccessible xChildItem( getAccessibleChild(
static_cast sal_Int32 ( pToolBox-GetItemPos( nDownItem ) ) ) );
VCLXAccessibleToolBoxItem* pItem = static_cast
VCLXAccessibleToolBoxItem* ( xChildItem.get() );
pItem-SetChild( xChild );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 335 commits - accessibility/source android/Bootstrap apple_remote/source avmedia/Module_avmedia.mk avmedia/source basctl/inc basctl/s
Rebased ref, commits from common ancestor:
commit ecfcb080c8b9d70d62d71c67c46afacec43c
Author: Douglas Mencken dougmenc...@gmail.com
Date: Wed Oct 29 17:03:27 2014 -0400
{useless now} disable OpenGL and OpenCL for OS X 10.5
currently, this patch is useless due to commits:
3b0b76462aa54f60bc9823d9c6ef64e5e35c1208
a5563934410406f806c22c9d388e297d6faea82b
Change-Id: I40def75aa83d9b780bbf7e7ec51096aa1f929457
diff --git a/configure.ac b/configure.ac
index 11f390b..cd57dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7173,6 +7173,11 @@ if test $_os = iOS; then
with_ppds=no
fi
+if test $_os = Darwin -a $with_macosx_sdk = 10.5; then
+enable_opengl=no
+enable_opencl=no
+fi
+
ENABLE_LWP=
if test $enable_lotuswordpro = yes; then
ENABLE_LWP=TRUE
commit b7334121acd7ad50a946192f9b58812106597068
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6a67101..077e40c 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit 70ceb8f8de1ac71e64c1a9416751236a438bac94
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index d454b21..e0ed992 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8e0d58b..ecbda95 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame = pFrame;
mMarkedRange = NSMakeRange(NSNotFound, 0);
mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
mpMouseEventListener = nil;
mpLastSuperEvent = nil;
}
@@ -1788,7 +1788,7 @@ private:
// some
Inserting a value into a XComponentContext
Hi all, How do you insert a value to be retrieved later into an XComponentContext reference? I see there is a XNameContainer, which is created by comphelper::NameContainer_createInstance(::cppu::UnoTypesal_Int32::get()) or whatever value you want. From here you then do insertByName. However, how do you then insert this into the component context? Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/drawingml/shape.hxx |1
oox/source/drawingml/shape.cxx |7 +++-
sd/qa/unit/data/pptx/bnc904423.pptx |binary
sd/qa/unit/import-tests.cxx | 55
4 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit 81cd386facedfbb15be6dffc10351262abf733f3
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Nov 28 19:57:58 2014 +0100
bnc#904423: Text(box) is rendered white on white when it is not
The problem was that the background color defined by theme
was not imported correctly, because the different fill
style comes from different sources (master slide, theme,
direct formatting) were applied on the shape in wrong order.
To solve this we need to store master slide defined fill style
in a different variable so theme style can be applied after master
slide defined style but before direct formatting.
Change-Id: I99ea981858b9fa391915570187c8ddfdf2be1f7a
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index c0303a3..81ae8ab 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -247,6 +247,7 @@ protected:
TextBodyPtr mpTextBody;
LinePropertiesPtr mpLinePropertiesPtr;
FillPropertiesPtr mpFillPropertiesPtr;
+FillPropertiesPtr mpShapeRefFillPropPtr;
GraphicPropertiesPtrmpGraphicPropertiesPtr;
CustomShapePropertiesPtrmpCustomShapePropertiesPtr;
table::TablePropertiesPtr mpTablePropertiesPtr;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2d48902..819c560 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -96,6 +96,7 @@ Shape::Shape( const sal_Char* pServiceName, bool
bDefaultHeight )
: mbIsChild( false )
, mpLinePropertiesPtr( new LineProperties )
, mpFillPropertiesPtr( new FillProperties )
+, mpShapeRefFillPropPtr( new FillProperties )
, mpGraphicPropertiesPtr( new GraphicProperties )
, mpCustomShapePropertiesPtr( new CustomShapeProperties )
, mp3DPropertiesPtr( new Shape3DProperties )
@@ -125,6 +126,7 @@ Shape::Shape( const ShapePtr pSourceShape )
, mpTextBody(pSourceShape-mpTextBody)
, mpLinePropertiesPtr( pSourceShape-mpLinePropertiesPtr )
, mpFillPropertiesPtr( pSourceShape-mpFillPropertiesPtr )
+, mpShapeRefFillPropPtr( pSourceShape-mpShapeRefFillPropPtr )
, mpGraphicPropertiesPtr( pSourceShape-mpGraphicPropertiesPtr )
, mpCustomShapePropertiesPtr( pSourceShape-mpCustomShapePropertiesPtr )
, mpTablePropertiesPtr( pSourceShape-mpTablePropertiesPtr )
@@ -292,7 +294,7 @@ void Shape::applyShapeReference( const Shape
rReferencedShape, bool bUseText )
mpTextBody.reset();
maShapeProperties = rReferencedShape.maShapeProperties;
mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
-mpFillPropertiesPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
+mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
mpTablePropertiesPtr = table::TablePropertiesPtr(
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties(
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
mpEffectPropertiesPtr = EffectPropertiesPtr( new EffectProperties(
*rReferencedShape.mpEffectPropertiesPtr.get() ) );
@@ -575,6 +577,9 @@ Reference XShape Shape::createAndInsert(
// TODO: use ph color when applying effect properties
//sal_Int32 nEffectPhClr = -1;
+// First apply reference shape's properties (shape on the master slide)
+aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
+
if( pTheme )
{
if( const ShapeStyleRef* pLineRef = getShapeStyleRef( XML_lnRef ) )
diff --git a/sd/qa/unit/data/pptx/bnc904423.pptx
b/sd/qa/unit/data/pptx/bnc904423.pptx
new file mode 100644
index 000..618ad1b
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc904423.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index bf98862..70063c4 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -84,6 +84,7 @@ public:
void testBnc584721_2();
void testBnc584721_3();
void testBnc584721_4();
+void testBnc904423();
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -111,6 +112,7 @@ public:
CPPUNIT_TEST(testBnc584721_2);
CPPUNIT_TEST(testBnc584721_3);
CPPUNIT_TEST(testBnc584721_4);
+CPPUNIT_TEST(testBnc904423);
CPPUNIT_TEST_SUITE_END();
};
@@ -865,6 +867,59 @@ void SdImportTest::testBnc584721_4()
xDocShRef-DoClose();
}
+void
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/drawingml/shape.hxx |1
oox/source/drawingml/shape.cxx|5 +
sd/qa/unit/data/pptx/ShapeLineProperties.pptx |binary
sd/qa/unit/import-tests.cxx | 73 ++
4 files changed, 78 insertions(+), 1 deletion(-)
New commits:
commit 664a56b3c81503bdf199edf1806676f0a35b956f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 30 14:31:39 2014 +0100
PPTX import: fix import of shape line properties defined by theme
See also:
81cd386facedfbb15be6dffc10351262abf733f3
Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 81ae8ab..0087214 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -246,6 +246,7 @@ protected:
TextBodyPtr mpTextBody;
LinePropertiesPtr mpLinePropertiesPtr;
+LinePropertiesPtr mpShapeRefLinePropPtr;
FillPropertiesPtr mpFillPropertiesPtr;
FillPropertiesPtr mpShapeRefFillPropPtr;
GraphicPropertiesPtrmpGraphicPropertiesPtr;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 819c560..ee6b268 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -95,6 +95,7 @@ namespace oox { namespace drawingml {
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
: mbIsChild( false )
, mpLinePropertiesPtr( new LineProperties )
+, mpShapeRefLinePropPtr( new LineProperties )
, mpFillPropertiesPtr( new FillProperties )
, mpShapeRefFillPropPtr( new FillProperties )
, mpGraphicPropertiesPtr( new GraphicProperties )
@@ -125,6 +126,7 @@ Shape::Shape( const ShapePtr pSourceShape )
, mbIsChild( pSourceShape-mbIsChild )
, mpTextBody(pSourceShape-mpTextBody)
, mpLinePropertiesPtr( pSourceShape-mpLinePropertiesPtr )
+, mpShapeRefLinePropPtr( pSourceShape-mpShapeRefLinePropPtr )
, mpFillPropertiesPtr( pSourceShape-mpFillPropertiesPtr )
, mpShapeRefFillPropPtr( pSourceShape-mpShapeRefFillPropPtr )
, mpGraphicPropertiesPtr( pSourceShape-mpGraphicPropertiesPtr )
@@ -293,7 +295,7 @@ void Shape::applyShapeReference( const Shape
rReferencedShape, bool bUseText )
else
mpTextBody.reset();
maShapeProperties = rReferencedShape.maShapeProperties;
-mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
+mpShapeRefLinePropPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
mpTablePropertiesPtr = table::TablePropertiesPtr(
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties(
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
@@ -579,6 +581,7 @@ Reference XShape Shape::createAndInsert(
// First apply reference shape's properties (shape on the master slide)
aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
+aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
if( pTheme )
{
diff --git a/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
new file mode 100644
index 000..36ece8c
Binary files /dev/null and b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 70063c4..16d542f 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -31,6 +31,9 @@
#include svx/svdoole2.hxx
#include svx/svdotable.hxx
#include svx/xflclit.hxx
+#include svx/xlineit0.hxx
+#include svx/xlnclit.hxx
+#include svx/xlnwtit.hxx
#include animations/animationnodehelper.hxx
#include sax/tools/converter.hxx
@@ -85,6 +88,7 @@ public:
void testBnc584721_3();
void testBnc584721_4();
void testBnc904423();
+void testShapeLineStyle();
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -113,6 +117,7 @@ public:
CPPUNIT_TEST(testBnc584721_3);
CPPUNIT_TEST(testBnc584721_4);
CPPUNIT_TEST(testBnc904423);
+CPPUNIT_TEST(testShapeLineStyle);
CPPUNIT_TEST_SUITE_END();
};
@@ -920,6 +925,74 @@ void SdImportTest::testBnc904423()
xDocShRef-DoClose();
}
+void SdImportTest::testShapeLineStyle()
+{
+// Here the problem was that different line properties were applied in
wrong order on the shape
+// Right order: 1) master slide line style, 2) theme, 3) direct formatting
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(sd/qa/unit/data/pptx/ShapeLineProperties.pptx), PPTX);
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/shape.hxx |1 +
oox/source/drawingml/shape.cxx |5 -
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 4146c1003f796f662a2f5b4ec150173df28fd9de
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 30 14:35:08 2014 +0100
PPTX import: shape effect properties defined by theme
Effect import is so poor by now that this changes does not seem
to have any effect, but later it can be helpful.
See also:
81cd386facedfbb15be6dffc10351262abf733f3
and
664a56b3c81503bdf199edf1806676f0a35b956f
Change-Id: I4e6a9952aa138959ab273db0494ef0cf76d8fc24
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 0087214..73357ba 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -254,6 +254,7 @@ protected:
table::TablePropertiesPtr mpTablePropertiesPtr;
Shape3DPropertiesPtrmp3DPropertiesPtr;
EffectPropertiesPtr mpEffectPropertiesPtr;
+EffectPropertiesPtr mpShapeRefEffectPropPtr;
PropertyMap maShapeProperties;
PropertyMap maDefaultShapeProperties;
TextListStylePtrmpMasterTextListStyle;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ee6b268..9cffa09 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -102,6 +102,7 @@ Shape::Shape( const sal_Char* pServiceName, bool
bDefaultHeight )
, mpCustomShapePropertiesPtr( new CustomShapeProperties )
, mp3DPropertiesPtr( new Shape3DProperties )
, mpEffectPropertiesPtr( new EffectProperties )
+, mpShapeRefEffectPropPtr( new EffectProperties )
, mpMasterTextListStyle( new TextListStyle )
, mnSubType( 0 )
, meFrameType( FRAMETYPE_GENERIC )
@@ -134,6 +135,7 @@ Shape::Shape( const ShapePtr pSourceShape )
, mpTablePropertiesPtr( pSourceShape-mpTablePropertiesPtr )
, mp3DPropertiesPtr( pSourceShape-mp3DPropertiesPtr )
, mpEffectPropertiesPtr (pSourceShape-mpEffectPropertiesPtr)
+, mpShapeRefEffectPropPtr(pSourceShape-mpShapeRefEffectPropPtr)
, maShapeProperties( pSourceShape-maShapeProperties )
, mpMasterTextListStyle( pSourceShape-mpMasterTextListStyle )
, mxShape()
@@ -299,7 +301,7 @@ void Shape::applyShapeReference( const Shape
rReferencedShape, bool bUseText )
mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
mpTablePropertiesPtr = table::TablePropertiesPtr(
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties(
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
-mpEffectPropertiesPtr = EffectPropertiesPtr( new EffectProperties(
*rReferencedShape.mpEffectPropertiesPtr.get() ) );
+mpShapeRefEffectPropPtr = EffectPropertiesPtr( new EffectProperties(
*rReferencedShape.mpEffectPropertiesPtr.get() ) );
mpMasterTextListStyle = TextListStylePtr( new TextListStyle(
*rReferencedShape.mpMasterTextListStyle.get() ) );
maShapeStyleRefs = rReferencedShape.maShapeStyleRefs;
maSize = rReferencedShape.maSize;
@@ -582,6 +584,7 @@ Reference XShape Shape::createAndInsert(
// First apply reference shape's properties (shape on the master slide)
aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
+aEffectProperties.assignUsed( *mpShapeRefEffectPropPtr );
if( pTheme )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5bac8dbfdd94ab79b32f2b55fee907f8348e0c6e Author: Zolnai Tamás tamas.zol...@collabora.com Date: Sun Nov 30 14:42:07 2014 +0100 This value is intended to be 200 MB in bytes Change-Id: Iae06202acc825ab95389465b9aea846f2772df26 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index af930da..545e0ec 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1466,7 +1466,7 @@ objects./desc labelTotal Graphic Cache Size/label /info - value22000/value + value209715200/value /prop prop oor:name=ObjectCacheSize oor:type=xs:int oor:nillable=false info ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 84090] Speed up oox::TokenMap by removing unnecessary maUniName OUString
https://bugs.freedesktop.org/show_bug.cgi?id=84090 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|NEW |RESOLVED CC||serval2...@yahoo.fr Resolution|--- |FIXED --- Comment #6 from Julien Nabet serval2...@yahoo.fr --- So fixed by David's patch, see https://bugs.freedesktop.org/show_bug.cgi?id=84090#c5 -- 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: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/tpline.cxx|2 -
cui/source/tabpages/tplnedef.cxx | 14 +-
filter/source/msfilter/msdffimp.cxx |2 -
include/svx/xdash.hxx | 39 +++---
include/svx/xenum.hxx |3 --
sc/source/filter/excel/xiescher.cxx |8 +++---
sd/source/ui/animations/motionpathtag.cxx |2 -
sd/source/ui/view/drviews9.cxx|4 +--
svx/source/svdraw/svdfmtf.cxx |8 +++---
svx/source/unodraw/XPropertyTable.cxx |2 -
svx/source/xoutdev/xattr.cxx | 12 -
svx/source/xoutdev/xtabdash.cxx |6 ++--
sw/source/filter/ww8/ww8graf.cxx |2 -
13 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 09b1c24dc971323e4b9bb4bd80517e1480cc7069
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sat Nov 29 12:50:37 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XDashStyle
Change-Id: Id14802a007a90508ee033e1dc964c57d3d5ef582
Reviewed-on: https://gerrit.libreoffice.org/13213
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 5bf1028..7d1fd99 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -102,7 +102,7 @@ SvxLineTabPage::SvxLineTabPage
pXPool ( static_castXOutdevItemPool*(rInAttrs.GetPool()) ),
aXLStyle( drawing::LineStyle_DASH ),
aXWidth ( 1 ),
-aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_LIGHTRED ),
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ),
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index c31c811..3b45fd90 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -65,7 +65,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
pXPool ( static_castXOutdevItemPool*(rInAttrs.GetPool()) ),
aXLStyle( drawing::LineStyle_DASH ),
aXWidth ( XOUT_WIDTH ),
-aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ),
@@ -209,7 +209,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxLineDefTabPage::CheckChanges_Impl()
{
// is here used to NOT lose changes
-//XDashStyle eXDS;
+//css::drawing::DashStyle eXDS;
if( m_pNumFldNumber1-IsValueChangedFromSaved() ||
m_pMtrLength1-IsValueChangedFromSaved() ||
@@ -844,12 +844,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
void SvxLineDefTabPage::FillDash_Impl()
{
-XDashStyle eXDS;
+css::drawing::DashStyle eXDS;
if( m_pCbxSynchronize-IsChecked() )
-eXDS = XDASH_RECTRELATIVE;
+eXDS = css::drawing::DashStyle_RECTRELATIVE;
else
-eXDS = XDASH_RECT;
+eXDS = css::drawing::DashStyle_RECT;
aDash.SetDashStyle( eXDS );
aDash.SetDots( (sal_uInt8) m_pNumFldNumber1-GetValue() );
@@ -868,8 +868,8 @@ void SvxLineDefTabPage::FillDash_Impl()
void SvxLineDefTabPage::FillDialog_Impl()
{
-XDashStyle eXDS = aDash.GetDashStyle(); // XDASH_RECT, XDASH_ROUND
-if( eXDS == XDASH_RECTRELATIVE )
+css::drawing::DashStyle eXDS = aDash.GetDashStyle(); //
css::drawing::DashStyle_RECT, css::drawing::DashStyle_ROUND
+if( eXDS == css::drawing::DashStyle_RECTRELATIVE )
m_pCbxSynchronize-Check();
else
m_pCbxSynchronize-Check( false );
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 22eda40..f62cc97 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -925,7 +925,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet
rSet, const MSO_SPT eSh
rSet.Put(XLineStyleItem( drawing::LineStyle_SOLID ) );
else
{
-XDashStyle eDash = XDASH_RECT;
+css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT;
sal_uInt16 nDots = 1;
sal_uInt32 nDotLen = nLineWidth / 360;
sal_uInt16 nDashes = 0;
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index 837f64a..4b0ef84 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -26,39 +26,40 @@
#include svx/xenum.hxx
#include svx/svxdllapi.h
+#include com/sun/star/drawing/DashStyle.hpp
#include vector
class SVX_DLLPUBLIC XDash
{
protected:
-
[Libreoffice-commits] core.git: Changes to 'private/moggi/vcl-opengl3'
New branch 'private/moggi/vcl-opengl3' available with the following commits: commit fd08b876304a6bd802687555e90a26ddac5fa337 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Nov 30 18:48:33 2014 +0100 implement virtual methods for OSX vcl backend Change-Id: Ifd7e06529cbf2e20bdd1560586420cda39c5a50c commit e74e4295292e66250e982c8a515dba9e25a5e3c6 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Nov 30 01:33:41 2014 +0100 Werror, Wunused-variable Change-Id: Ia361b1e37ad8b0daf49ff236c855a70d7d8bf8f4 ___ 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|71278 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||71278 -- 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 'libreoffice-4-4' - 3 commits - include/oox officecfg/registry oox/source sd/qa
include/oox/drawingml/shape.hxx|2
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2
oox/source/drawingml/shape.cxx | 12 +
sd/qa/unit/data/pptx/ShapeLineProperties.pptx |binary
sd/qa/unit/data/pptx/bnc904423.pptx|binary
sd/qa/unit/import-tests.cxx| 128 +
6 files changed, 141 insertions(+), 3 deletions(-)
New commits:
commit bfe948b9d88dddbe0875f74d3b72ce02f0b78863
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 30 14:42:07 2014 +0100
This value is intended to be 200 MB in bytes
Change-Id: Iae06202acc825ab95389465b9aea846f2772df26
(cherry picked from commit 5bac8dbfdd94ab79b32f2b55fee907f8348e0c6e)
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 17ed48a..719ed09 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1466,7 +1466,7 @@
objects./desc
labelTotal Graphic Cache Size/label
/info
- value22000/value
+ value209715200/value
/prop
prop oor:name=ObjectCacheSize oor:type=xs:int
oor:nillable=false
info
commit 16f5067b43ddc61d43942107f2928bdcbe0c4447
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 30 18:53:48 2014 +0100
PPTX import: fix import of shape line properties defined by theme
See also:
81cd386facedfbb15be6dffc10351262abf733f3
(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)
Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 81ae8ab..0087214 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -246,6 +246,7 @@ protected:
TextBodyPtr mpTextBody;
LinePropertiesPtr mpLinePropertiesPtr;
+LinePropertiesPtr mpShapeRefLinePropPtr;
FillPropertiesPtr mpFillPropertiesPtr;
FillPropertiesPtr mpShapeRefFillPropPtr;
GraphicPropertiesPtrmpGraphicPropertiesPtr;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 819c560..ee6b268 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -95,6 +95,7 @@ namespace oox { namespace drawingml {
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
: mbIsChild( false )
, mpLinePropertiesPtr( new LineProperties )
+, mpShapeRefLinePropPtr( new LineProperties )
, mpFillPropertiesPtr( new FillProperties )
, mpShapeRefFillPropPtr( new FillProperties )
, mpGraphicPropertiesPtr( new GraphicProperties )
@@ -125,6 +126,7 @@ Shape::Shape( const ShapePtr pSourceShape )
, mbIsChild( pSourceShape-mbIsChild )
, mpTextBody(pSourceShape-mpTextBody)
, mpLinePropertiesPtr( pSourceShape-mpLinePropertiesPtr )
+, mpShapeRefLinePropPtr( pSourceShape-mpShapeRefLinePropPtr )
, mpFillPropertiesPtr( pSourceShape-mpFillPropertiesPtr )
, mpShapeRefFillPropPtr( pSourceShape-mpShapeRefFillPropPtr )
, mpGraphicPropertiesPtr( pSourceShape-mpGraphicPropertiesPtr )
@@ -293,7 +295,7 @@ void Shape::applyShapeReference( const Shape
rReferencedShape, bool bUseText )
else
mpTextBody.reset();
maShapeProperties = rReferencedShape.maShapeProperties;
-mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
+mpShapeRefLinePropPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
mpTablePropertiesPtr = table::TablePropertiesPtr(
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties(
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
@@ -579,6 +581,7 @@ Reference XShape Shape::createAndInsert(
// First apply reference shape's properties (shape on the master slide)
aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
+aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
if( pTheme )
{
diff --git a/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
new file mode 100644
index 000..36ece8c
Binary files /dev/null and b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 70063c4..b601871 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -31,6 +31,9 @@
#include svx/svdoole2.hxx
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|67534 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||67534 -- 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 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo72031.rtf |1
sw/qa/extras/rtfimport/rtfimport.cxx |9 ++--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 26 +++--
3 files changed, 24 insertions(+), 12 deletions(-)
New commits:
commit 4cf0b919ed1d3bede755f403774fb2dc05b86a2a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Nov 29 11:43:10 2014 +0100
fdo#72031 RTF import: bogus call to getBestTextEncodingFromLocale()
There were two problems here. First, commit
bbe3627eece0c3486e7ea11f2f13377aaa3a8fed (rtftok: stop sending
sprm:CRgFtc{0,1,2} tokens, 2014-03-05) broke the use-case when the font
encoding is 0, but it's present. Before that commit, we parsed the font
encoding instantly; after that commit we parse it once we have a font
name. If we do that, then we have to have an idea if we have a font
encoding. Given that 0 is a valid encoding, use -1 for the have no
encoding case instead.
Second, commit 7839633fb356285652ed96f4bf3f85bcd5b561a4 (fdo#85889
handle pc, pca and mac rtf keywords in writerfilter, 2014-11-24) abused
m_nCurrentEncoding, which is meant to be used within the font table
only. The problem with this is that this way only the first font will
get the encoding, while the spec says it should be used in every context
where there is no other explicit encoding. Fix this by setting the
default encoding for those 3 control words instead -- and consider the
default encoding in getEncoding().
Change-Id: Ia1d71f8ce70f2a53a3770b4840e21362d082e71f
(cherry picked from commit fa15d039e3a553da8500c17190d27169a9477cf2)
diff --git a/sw/qa/extras/rtfimport/data/fdo72031.rtf
b/sw/qa/extras/rtfimport/data/fdo72031.rtf
new file mode 100644
index 000..ee589da
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo72031.rtf
@@ -0,0 +1 @@
+{\rtf1\ansi\ansicpg1250\deff0\deflang1038{\fonttbl{\f0\fnil\fcharset2
Symbol;}{\f1\fnil\fcharset238 MS Shell Dlg
2;}}\viewkind4\uc1\pard\f0\fs23\'c5\f1\fs17\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7dc67c3..0e916d3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -66,7 +66,7 @@ public:
virtual void preTest(const char* filename) SAL_OVERRIDE
{
m_aSavedSettings = Application::GetSettings();
-if (OString(filename) == fdo48023.rtf)
+if (OString(filename) == fdo48023.rtf || OString(filename) ==
fdo72031.rtf)
{
AllSettings aSettings(m_aSavedSettings);
aSettings.SetLanguageTag(LanguageTag(ru));
@@ -82,7 +82,7 @@ public:
virtual void postTest(const char* filename) SAL_OVERRIDE
{
-if (OString(filename) == fdo48023.rtf || OString(filename) ==
fdo44211.rtf)
+if (OString(filename) == fdo48023.rtf || OString(filename) ==
fdo72031.rtf || OString(filename) == fdo44211.rtf)
Application::SetSettings(m_aSavedSettings);
}
@@ -2206,6 +2206,11 @@ DECLARE_RTFIMPORT_TEST(testFdo85889mac,
fdo85889-mac.rtf)
CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString());
}
+DECLARE_RTFIMPORT_TEST(testFdo72031, fdo72031.rtf)
+{
+OUString aExpected(\xc3\x85, 2, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, getRun(getParagraph(1), 1)-getString());
+}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5bab89b..5fb1225 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -256,7 +256,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_bObject(false),
m_aFontTableEntries(),
m_nCurrentFontIndex(0),
- m_nCurrentEncoding(0),
+ m_nCurrentEncoding(-1),
m_nDefaultFontIndex(-1),
m_aStyleTableEntries(),
m_nCurrentStyleIndex(0),
@@ -643,8 +643,14 @@ rtl_TextEncoding RTFDocumentImpl::getEncoding(int
nFontIndex)
{
std::mapint, rtl_TextEncoding::iterator it =
m_aFontEncodings.find(nFontIndex);
if (it != m_aFontEncodings.end())
+// We have a font encoding associated to this font.
return it-second;
-return
msfilter::util::getBestTextEncodingFromLocale(Application::GetSettings().GetLanguageTag().getLocale());
+else if (m_aDefaultState.nCurrentEncoding !=
rtl_getTextEncodingFromWindowsCharset(0))
+// We have a default encoding.
+return m_aDefaultState.nCurrentEncoding;
+else
+// Guess based on locale.
+return
msfilter::util::getBestTextEncodingFromLocale(Application::GetSettings().GetLanguageTag().getLocale());
}
else
return m_pSuperstream-getEncoding(nFontIndex);
@@ -1165,10 +1171,10 @@ void RTFDocumentImpl::text(OUString rString)
case
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/opengl
vcl/inc/opengl/win/WinDeviceInfo.hxx |6 +++---
vcl/opengl/win/WinDeviceInfo.cxx | 32 +---
2 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit 82d767a50629aa8e1c6fa005439c92153b22e7f6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Nov 30 21:01:35 2014 +0100
whitelist some drivers
Especially the ones from our developer machines as they are better tested
than anything else.
Change-Id: Id6ff6bcae314c03453d82ee4e64aaef1bd5ed84a
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 2a887c4..6fb7834 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -12,8 +12,6 @@
#include opengl/DeviceInfo.hxx
#include rtl/ustring.hxx
-#include vector
-#include stdint.h
namespace wgl {
@@ -82,7 +80,7 @@ struct DriverInfo
DriverInfo(OperatingSystem os, const OUString vendor, DeviceFamilyVector*
devices,
VersionComparisonOp op,
-uint64_t driverVersion, const char *suggestedVersion = nullptr,
+uint64_t driverVersion, bool bWhiteListed = false, const char
*suggestedVersion = nullptr,
bool ownDevices = false);
DriverInfo();
@@ -101,6 +99,8 @@ struct DriverInfo
// deallocated. False by default.
bool mbDeleteDevices;
+bool mbWhitelisted;
+
VersionComparisonOp meComparisonOp;
/* versions are assumed to be A.B.C.D packed as 0x */
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index c9bf1ff..824d0fc 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -12,22 +12,25 @@
#include windows.h
#include setupapi.h
#include cstdint
-#include rtl/ustrbuf.hxx
OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
std::vectorwgl::DriverInfo WinOpenGLDeviceInfo::maDriverInfo;
#define APPEND_TO_DRIVER_BLOCKLIST(os, vendor, devices, driverComparator,
driverVersion, suggestedVersion) \
-maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices,
driverComparator, driverVersion, suggestedVersion))
+maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices,
driverComparator, driverVersion, false, suggestedVersion))
+
#define APPEND_TO_DRIVER_BLOCKLIST2(os, vendor, devices, driverComparator,
driverVersion) \
maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices,
driverComparator, driverVersion))
+#define APPEND_TO_DRIVER_WHITELIST(os, vendor, devices, driverComparator,
driverVersion) \
+maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices,
driverComparator, driverVersion, true))
+
#define APPEND_TO_DRIVER_BLOCKLIST_RANGE(os, vendor, devices,
driverComparator, driverVersion, driverVersionMax, suggestedVersion) \
do { \
assert(driverComparator == wgl::DRIVER_BETWEEN_EXCLUSIVE || \
driverComparator == wgl::DRIVER_BETWEEN_INCLUSIVE || \
driverComparator == wgl::DRIVER_BETWEEN_INCLUSIVE_START); \
-wgl::DriverInfo info(os, vendor, devices, driverComparator,
driverVersion, suggestedVersion); \
+wgl::DriverInfo info(os, vendor, devices, driverComparator,
driverVersion, false, suggestedVersion); \
info.mnDriverVersionMax = driverVersionMax; \
maDriverInfo.push_back(info); \
} while (false)
@@ -373,6 +376,7 @@ DriverInfo::DriverInfo()
maAdapterVendor(WinOpenGLDeviceInfo::GetDeviceVendor(VendorAll)),
mpDevices(allDevices),
mbDeleteDevices(false),
+mbWhitelisted(false),
meComparisonOp(DRIVER_COMPARISON_IGNORED),
mnDriverVersion(0),
mnDriverVersionMax(0)
@@ -382,6 +386,7 @@ DriverInfo::DriverInfo(OperatingSystem os, const OUString
vendor,
DeviceFamilyVector* devices,
VersionComparisonOp op,
uint64_t driverVersion,
+bool bWhitelisted,
const char *suggestedVersion /* = nullptr */,
bool ownDevices /* = false */)
: meOperatingSystem(os),
@@ -389,6 +394,7 @@ DriverInfo::DriverInfo(OperatingSystem os, const OUString
vendor,
maAdapterVendor(vendor),
mpDevices(devices),
mbDeleteDevices(ownDevices),
+mbWhitelisted(bWhitelisted),
meComparisonOp(op),
mnDriverVersion(driverVersion),
mnDriverVersionMax(0)
@@ -401,6 +407,7 @@ DriverInfo::DriverInfo(const DriverInfo aOrig)
: meOperatingSystem(aOrig.meOperatingSystem),
mnOperatingSystemVersion(aOrig.mnOperatingSystemVersion),
maAdapterVendor(aOrig.maAdapterVendor),
+mbWhitelisted(aOrig.mbWhitelisted),
meComparisonOp(aOrig.meComparisonOp),
mnDriverVersion(aOrig.mnDriverVersion),
mnDriverVersionMax(aOrig.mnDriverVersionMax)
@@ -657,6 +664,13 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
}
if (match || maDriverInfo[i].mnDriverVersion ==
wgl::DriverInfo::allDriverVersions) {
+// white listed drivers
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|76239 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||76239 -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|76995 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||76995 -- 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: writerfilter/source
writerfilter/source/resourcemodel/TagLogger.cxx | 64
1 file changed, 64 deletions(-)
New commits:
commit 5486aae1708835c44e4c757dbee785eb534bb214
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sun Nov 30 21:09:10 2014 +0100
loplugin:unreffun: PropertySetDumpHandler
Change-Id: I5e2776a7c7a01ea7486b7608a8664aa88842a510
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx
b/writerfilter/source/resourcemodel/TagLogger.cxx
index 7551871..8008268 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -237,70 +237,6 @@ namespace writerfilter
xmlTextWriterEndElement( pWriter );
}
-class PropertySetDumpHandler : public Properties
-{
-IdToString::Pointer_t mpIdToString;
-TagLogger* m_pLogger;
-
-public:
-PropertySetDumpHandler(TagLogger* pLogger,
-IdToString::Pointer_t pIdToString);
-virtual ~PropertySetDumpHandler();
-
-void resolve(writerfilter::ReferenceProperties::Pointer_t props);
-
-virtual void attribute(Id name, Value val) SAL_OVERRIDE;
-virtual void sprm(Sprm sprm) SAL_OVERRIDE;
-};
-
-PropertySetDumpHandler::PropertySetDumpHandler(TagLogger* pLogger,
-IdToString::Pointer_t pIdToString) :
-mpIdToString(pIdToString),
-m_pLogger(pLogger)
-{
-}
-
-PropertySetDumpHandler::~PropertySetDumpHandler()
-{
-}
-
-void PropertySetDumpHandler::resolve(
-writerfilter::ReferenceProperties::Pointer_t pProps)
-{
-if (pProps.get() != nullptr)
-pProps-resolve( *this );
-}
-
-void PropertySetDumpHandler::attribute(Id name, Value val)
-{
-m_pLogger-startElement( attribute );
-
-m_pLogger-attribute(name, (*QNameToString::Instance())(name));
-m_pLogger-attribute(value, val.toString());
-
-resolve(val.getProperties());
-
-m_pLogger-endElement();
-}
-
-void PropertySetDumpHandler::sprm(Sprm rSprm)
-{
-m_pLogger-startElement( sprm );
-
-std::string sName;
-
-if (mpIdToString != IdToString::Pointer_t())
-sName = mpIdToString-toString(rSprm.getId());
-
-m_pLogger-attribute( name, sName );
-
-m_pLogger-attribute( id, rSprm.getId() );
-m_pLogger-attribute( value, rSprm.getValue()-toString() );
-
-resolve( rSprm.getProps() );
-
-m_pLogger-endElement();
-}
#endif
}
___
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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|79538 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||79538 -- 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: 4 commits - sc/source sw/source vcl/generic vcl/source
sc/source/filter/lotus/lotimpop.cxx | 59 +++--
sc/source/filter/lotus/op.cxx | 162
sw/source/core/text/txttab.cxx |4
vcl/generic/glyphs/scrptrun.cxx |6 +
vcl/generic/glyphs/scrptrun.h |4
vcl/source/fontsubset/sft.cxx |9 +-
6 files changed, 139 insertions(+), 105 deletions(-)
New commits:
commit 6688e5426435c03edffef75c6cfd3f3033246521
Author: Caolán McNamara caol...@redhat.com
Date: Sun Nov 30 20:27:36 2014 +
fix higher debug level build
Change-Id: Ic5aae12c6a32c535faf790892810522aa4c527f5
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 4956a0d..89bf45f 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -510,9 +510,9 @@ void SwTabPortion::Paint( const SwTxtPaintInfo rInf ) const
SwViewOption::IsFieldShadings())
{
const sal_uInt16 nTmpWidth = PrtWidth();
-static_castSwTabPortion*(this)-PrtWidth( GetFixWidth() );
+const_castSwTabPortion*(this)-PrtWidth( GetFixWidth() );
rInf.DrawViewOpt( *this, POR_TAB );
-static_castSwTabPortion*(this)-PrtWidth( nTmpWidth );
+const_castSwTabPortion*(this)-PrtWidth( nTmpWidth );
}
#endif
commit f7527ebddafb769738b75b53742df3b65d074f52
Author: Caolán McNamara caol...@redhat.com
Date: Sat Nov 29 20:46:43 2014 +
coverity#1242775 Use of untrusted scalar value
and coverity#1242728
and coverity#1242836
and coverity#1242927
and coverity#1242942
and coverity#1242937
and coverity#1242793
and coverity#1242945
move the casts to one single place before they get
scrutinized
Change-Id: I8a14f8d22b5c38d04f4fb538a1eb0baeef04e390
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 7cce192..c5017c9 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -330,16 +330,17 @@ void ImportLotus::RowPresentation( sal_uInt16 nRecLen )
void ImportLotus::NamedSheet( void )
{
-sal_uInt16 nLTab;
-OUStringaName;
+sal_uInt16 nTmpTab(0);
+Read(nTmpTab);
+OUString aName;
+Read(aName);
-Read( nLTab );
-Read( aName );
+SCTAB nLTab(static_castSCTAB(nTmpTab));
-if( pD-HasTable( static_castSCTAB (nLTab) ) )
-pD-RenameTab( static_castSCTAB (nLTab), aName );
+if (pD-HasTable(nLTab))
+pD-RenameTab(nLTab, aName);
else
-pD-InsertTab( static_castSCTAB (nLTab), aName );
+pD-InsertTab(nLTab, aName);
}
void ImportLotus::Font_Face( void )
@@ -384,8 +385,6 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
{
OSL_ENSURE( nExtTab = 0, *ImportLotus::_Row(): not possible! );
-sal_uInt16 nRow;
-sal_uInt16 nHeight;
sal_uInt16nCntDwn = (nRecLen 4) ? 0 : ( nRecLen - 4 ) / 5;
SCCOL nColCnt = 0;
sal_uInt8 nRepeats;
@@ -394,14 +393,19 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
boolbCenter = false;
SCCOL nCenterStart = 0, nCenterEnd = 0;
-Read( nRow );
-Read( nHeight );
+sal_uInt16 nTmpRow(0);
+Read(nTmpRow);
+SCROW nRow(static_castSCROW(nTmpRow));
+sal_uInt16 nHeight(0);
+Read(nHeight);
nHeight = 0x0FFF;
nHeight *= 22;
+SCTAB nDestTab(static_castSCTAB(nExtTab));
+
if( nHeight )
-pD-SetRowHeight( static_castSCROW (nRow), static_castSCTAB
(nExtTab), nHeight );
+pD-SetRowHeight(nRow, nDestTab, nHeight);
LotusContext rContext = aConv.getContext();
while( nCntDwn )
@@ -411,36 +415,39 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
if( aAttr.HasStyles() )
rContext.pLotusRoot-pAttrTable-SetAttr(
-nColCnt, static_castSCCOL ( nColCnt + nRepeats ),
static_castSCROW (nRow), aAttr );
+nColCnt, static_castSCCOL ( nColCnt + nRepeats ), nRow,
aAttr );
// Do this here and NOT in class LotAttrTable, as we only add
attributes if the other
// attributes are set
// - for Center-Attribute default is centered
if( aAttr.IsCentered() )
-{
+{
if( bCenter )
+{
+if (pD-HasData(nColCnt, nRow, nDestTab))
{
-if( pD-HasData( nColCnt, static_castSCROW (nRow),
static_castSCTAB (nExtTab) ) )
-{// new Center after previous Center
-pD-DoMerge( static_castSCTAB (nExtTab), nCenterStart,
static_castSCROW (nRow), nCenterEnd, static_castSCROW (nRow) );
+// new Center after previous Center
+pD-DoMerge(nDestTab, nCenterStart, nRow, nCenterEnd,
nRow);
nCenterStart = nColCnt;
-}
}
+}
else
-{//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/generic
vcl/generic/glyphs/scrptrun.cxx |6 +-
vcl/generic/glyphs/scrptrun.h |4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f4d977595492573abff4b491b26f1a4f2a57c4f8
Author: Caolán McNamara caol...@redhat.com
Date: Sat Nov 29 16:44:12 2014 +
give us a parenStack which can grow to fit any input
Change-Id: Ic464184fe367da33bf8c4790b82656b140e3cbd0
(cherry picked from commit cced2f6b866877c39afe86f4af18622cb4022bef)
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index 965fbf1..cd7ce41 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -175,7 +175,11 @@ UBool ScriptRun::next()
// characters above it on the stack will be poped.
if (pairIndex = 0) {
if ((pairIndex 1) == 0) {
-parenStack[++parenSP].pairIndex = pairIndex;
+++parenSP;
+int32_t nVecSize = parenStack.size();
+if (parenSP == nVecSize)
+parenStack.resize(nVecSize + 128);
+parenStack[parenSP].pairIndex = pairIndex;
parenStack[parenSP].scriptCode = scriptCode;
} else if (parenSP = 0) {
int32_t pi = pairIndex ~1;
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 56ea88c..3dea2e4 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -43,6 +43,7 @@
#include unicode/utypes.h
#include unicode/uobject.h
#include unicode/uscript.h
+#include vector
namespace vcl {
@@ -112,7 +113,7 @@ private:
int32_t scriptEnd;
UScriptCode scriptCode;
-ParenStackEntry parenStack[128];
+std::vectorParenStackEntry parenStack;
int32_t parenSP;
static int8_t highBit(int32_t value);
@@ -166,6 +167,7 @@ inline void ScriptRun::reset()
scriptEnd = charStart;
scriptCode = USCRIPT_INVALID_CODE;
parenSP = -1;
+parenStack.resize(128);
}
inline void ScriptRun::reset(int32_t start, int32_t length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/icu
external/icu/UnpackedTarball_icu.mk |1
external/icu/icu4c-scriptrun.patch | 58
2 files changed, 59 insertions(+)
New commits:
commit a66451887425ddd9387e2b25d5125916f4a35f83
Author: Caolán McNamara caol...@redhat.com
Date: Sun Nov 30 20:38:42 2014 +
mirror fixes for fdo#78906 and deb#766788 into icu
Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 0f6ecd1..d541e2e 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
+ external/icu/icu4c-scriptrun.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-scriptrun.patch
b/external/icu/icu4c-scriptrun.patch
new file mode 100644
index 000..e307811
--- /dev/null
+++ b/external/icu/icu4c-scriptrun.patch
@@ -0,0 +1,58 @@
+--- misc/icu/source/extra/scrptrun/scrptrun.cpp
misc/build/icu/source/extra/scrptrun/scrptrun.cpp
+@@ -150,7 +150,11 @@
+ // characters above it on the stack will be poped.
+ if (pairIndex = 0) {
+ if ((pairIndex 1) == 0) {
+-parenStack[++parenSP].pairIndex = pairIndex;
++++parenSP;
++int32_t nVecSize = parenStack.size();
++if (parenSP == nVecSize)
++parenStack.resize(nVecSize + 128);
++parenStack[parenSP].pairIndex = pairIndex;
+ parenStack[parenSP].scriptCode = scriptCode;
+ } else if (parenSP = 0) {
+ int32_t pi = pairIndex ~1;
+@@ -184,7 +188,14 @@
+ // pop it from the stack
+ if (pairIndex = 0 (pairIndex 1) != 0 parenSP = 0) {
+ parenSP -= 1;
+-startSP -= 1;
++/* decrement startSP only if it is = 0,
++ decrementing it unnecessarily will lead to memory
corruption
++ while processing the above while block.
++ e.g. startSP = -4 , parenSP = -1
++*/
++if (startSP = 0) {
++startSP -= 1;
++}
+ }
+ } else {
+ // if the run broke on a surrogate pair,
+--- misc/icu/source/extra/scrptrun/scrptrun.h
misc/build/icu/source/extra/scrptrun/scrptrun.h
+@@ -17,6 +17,7 @@
+ #include unicode/utypes.h
+ #include unicode/uobject.h
+ #include unicode/uscript.h
++#include vector
+
+ struct ScriptRecord
+ {
+@@ -79,7 +80,7 @@
+ int32_t scriptEnd;
+ UScriptCode scriptCode;
+
+-ParenStackEntry parenStack[128];
++std::vectorParenStackEntry parenStack;
+ int32_t parenSP;
+
+ static int8_t highBit(int32_t value);
+@@ -133,6 +134,7 @@
+ scriptEnd = charStart;
+ scriptCode = USCRIPT_INVALID_CODE;
+ parenSP = -1;
++parenStack.resize(128);
+ }
+
+ inline void ScriptRun::reset(int32_t start, int32_t length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/icu
external/icu/UnpackedTarball_icu.mk |1
external/icu/icu4c-scriptrun.patch | 58
2 files changed, 59 insertions(+)
New commits:
commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf
Author: Caolán McNamara caol...@redhat.com
Date: Sun Nov 30 20:38:42 2014 +
mirror fixes for fdo#78906 and deb#766788 into icu
Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 0f6ecd1..d541e2e 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
+ external/icu/icu4c-scriptrun.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-scriptrun.patch
b/external/icu/icu4c-scriptrun.patch
new file mode 100644
index 000..e307811
--- /dev/null
+++ b/external/icu/icu4c-scriptrun.patch
@@ -0,0 +1,58 @@
+--- misc/icu/source/extra/scrptrun/scrptrun.cpp
misc/build/icu/source/extra/scrptrun/scrptrun.cpp
+@@ -150,7 +150,11 @@
+ // characters above it on the stack will be poped.
+ if (pairIndex = 0) {
+ if ((pairIndex 1) == 0) {
+-parenStack[++parenSP].pairIndex = pairIndex;
++++parenSP;
++int32_t nVecSize = parenStack.size();
++if (parenSP == nVecSize)
++parenStack.resize(nVecSize + 128);
++parenStack[parenSP].pairIndex = pairIndex;
+ parenStack[parenSP].scriptCode = scriptCode;
+ } else if (parenSP = 0) {
+ int32_t pi = pairIndex ~1;
+@@ -184,7 +188,14 @@
+ // pop it from the stack
+ if (pairIndex = 0 (pairIndex 1) != 0 parenSP = 0) {
+ parenSP -= 1;
+-startSP -= 1;
++/* decrement startSP only if it is = 0,
++ decrementing it unnecessarily will lead to memory
corruption
++ while processing the above while block.
++ e.g. startSP = -4 , parenSP = -1
++*/
++if (startSP = 0) {
++startSP -= 1;
++}
+ }
+ } else {
+ // if the run broke on a surrogate pair,
+--- misc/icu/source/extra/scrptrun/scrptrun.h
misc/build/icu/source/extra/scrptrun/scrptrun.h
+@@ -17,6 +17,7 @@
+ #include unicode/utypes.h
+ #include unicode/uobject.h
+ #include unicode/uscript.h
++#include vector
+
+ struct ScriptRecord
+ {
+@@ -79,7 +80,7 @@
+ int32_t scriptEnd;
+ UScriptCode scriptCode;
+
+-ParenStackEntry parenStack[128];
++std::vectorParenStackEntry parenStack;
+ int32_t parenSP;
+
+ static int8_t highBit(int32_t value);
+@@ -133,6 +134,7 @@
+ scriptEnd = charStart;
+ scriptCode = USCRIPT_INVALID_CODE;
+ parenSP = -1;
++parenStack.resize(128);
+ }
+
+ inline void ScriptRun::reset(int32_t start, int32_t length)
___
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/filter/lotus/lotform.cxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit 317b5bc5f801135b027e02d5acfc407cc2d05689 Author: Andras Timar andras.ti...@collabora.com Date: Sun Nov 30 22:17:10 2014 +0100 amended solution to @TERM and @CTERM import from Lotus 1-2-3 Change-Id: If23e0d80585911ea75c2a24f1e59e71f1edb4774 diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 7c6fc45..f0de971 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -417,7 +417,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray* rpErg, sal_Int32 rRest, eType = ( pIndexToType )( nOc ); eOc = ( pIndexToToken)( nOc ); -if( eOc == ocNoName || eOc == ocZZR ) +if( eOc == ocNoName ) pExtName = GetAddInName( nOc ); switch( eType ) @@ -1030,8 +1030,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) ocNoName, // 114 Call() ocIndirect, // 115 @@() ocZins, // 116 Rate() -ocZZR, // 117 Term() -ocZZR, // 118 Cterm() +ocNoName, // 117 Term() +ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocDIA, // 120 Syd(), Soy() ocGDA, // 121 Ddb() @@ -1559,8 +1559,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocNoName, // 114 Call() ocIndirect, // 115 @@() ocZins, // 116 Rate() -ocZZR, // 117 Term() -ocZZR, // 118 Cterm() +ocNoName, // 117 Term() +ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocDIA, // 120 Syd(), Soy() ocGDA, // 121 Ddb() @@ -2038,6 +2038,10 @@ static DefTokenId lcl_KnownAddIn( const OString rTest ) eId=ocNormDist; else if (rTest == CRITBINOMIAL) eId=ocKritBinom; +else if (rTest == TERM) +eId=ocZZR; +else if (rTest == CTERM) +eId=ocZZR; return eId; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||66232 -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|66232 | -- 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] help.git: Branch 'libreoffice-4-4' - source/text
source/text/sdraw/guide/graphic_insert.xhp |2 +- source/text/shared/guide/imagemap.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 40967add67da1353dae0f1f9cc31475f4650381c Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Sun Nov 30 22:08:54 2014 +0100 Image is not in Media submenu anymore Change-Id: Ic3244c9bf782b43fd1cca1de19dc7a1a6be90734 Reviewed-on: https://gerrit.libreoffice.org/13224 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/source/text/sdraw/guide/graphic_insert.xhp b/source/text/sdraw/guide/graphic_insert.xhp index ce00e2b..1f97d16 100644 --- a/source/text/sdraw/guide/graphic_insert.xhp +++ b/source/text/sdraw/guide/graphic_insert.xhp @@ -38,7 +38,7 @@ /variable/paragraph list type=ordered listitem -paragraph role=listitem id=par_id3155600 xml-lang=en-US l10n=CHG oldref=2Choose emphInsert - Media - Image/emph./paragraph +paragraph role=listitem id=par_id3155600 xml-lang=en-US l10n=CHG oldref=2Choose emphInsert - Image/emph./paragraph /listitem listitem paragraph role=listitem id=par_id3150749 xml-lang=en-US l10n=U oldref=3Locate the image you want to insert. Select the emphLink/emph check box to insert only a link to the image. If you want to see the image before you insert it, select emphPreview/emph./paragraph diff --git a/source/text/shared/guide/imagemap.xhp b/source/text/shared/guide/imagemap.xhp index a0f3dca..0043a98 100644 --- a/source/text/shared/guide/imagemap.xhp +++ b/source/text/shared/guide/imagemap.xhp @@ -44,7 +44,7 @@ paragraph xml-lang=en-US id=par_idN1067E role=paragraph l10n=NEWPosition the cursor where you want the ImageMap in your document./paragraph /listitem listitem -paragraph xml-lang=en-US id=par_idN10682 role=paragraph l10n=NEWChoose emphInsert - Media - Image/emph, select and insert a bitmap image./paragraph +paragraph xml-lang=en-US id=par_idN10682 role=paragraph l10n=NEWChoose emphInsert - Image/emph, select and insert a bitmap image./paragraph /listitem listitem paragraph xml-lang=en-US id=par_idN1068A role=paragraph l10n=NEWWith the image selected, choose emphEdit - ImageMap/emph. You see the link href=text/shared/01/0222.xhpImageMap Editor/link, which displays the image at the background./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2713480bc86926f9e910fbfa22b54a8beb69304a Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Sun Nov 30 22:08:54 2014 +0100 Updated core Project: help 40967add67da1353dae0f1f9cc31475f4650381c Image is not in Media submenu anymore Change-Id: Ic3244c9bf782b43fd1cca1de19dc7a1a6be90734 Reviewed-on: https://gerrit.libreoffice.org/13224 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/helpcontent2 b/helpcontent2 index 6faea8d..40967ad 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6faea8d8483f514798e36b51478f6e10c27f9f92 +Subproject commit 40967add67da1353dae0f1f9cc31475f4650381c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/filter/lotus/lotform.cxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit 474336de5964333e01d5cee36f96468ff4e46d29 Author: Andras Timar andras.ti...@collabora.com Date: Sun Nov 30 22:17:10 2014 +0100 amended solution to @TERM and @CTERM import from Lotus 1-2-3 Change-Id: If23e0d80585911ea75c2a24f1e59e71f1edb4774 (cherry picked from commit 317b5bc5f801135b027e02d5acfc407cc2d05689) diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 7c6fc45..f0de971 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -417,7 +417,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray* rpErg, sal_Int32 rRest, eType = ( pIndexToType )( nOc ); eOc = ( pIndexToToken)( nOc ); -if( eOc == ocNoName || eOc == ocZZR ) +if( eOc == ocNoName ) pExtName = GetAddInName( nOc ); switch( eType ) @@ -1030,8 +1030,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) ocNoName, // 114 Call() ocIndirect, // 115 @@() ocZins, // 116 Rate() -ocZZR, // 117 Term() -ocZZR, // 118 Cterm() +ocNoName, // 117 Term() +ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocDIA, // 120 Syd(), Soy() ocGDA, // 121 Ddb() @@ -1559,8 +1559,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocNoName, // 114 Call() ocIndirect, // 115 @@() ocZins, // 116 Rate() -ocZZR, // 117 Term() -ocZZR, // 118 Cterm() +ocNoName, // 117 Term() +ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocDIA, // 120 Syd(), Soy() ocGDA, // 121 Ddb() @@ -2038,6 +2038,10 @@ static DefTokenId lcl_KnownAddIn( const OString rTest ) eId=ocNormDist; else if (rTest == CRITBINOMIAL) eId=ocKritBinom; +else if (rTest == TERM) +eId=ocZZR; +else if (rTest == CTERM) +eId=ocZZR; return eId; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fix on Bug 38829 - Add fractional inches to units
Hi, My team and I have narrowed down the modification required to make this happened. We modified MetricField in vcl/source/control/field.cxx to take in fractional data format (i.e. 1 1/2), parse and convert to decimal format and then output it. Since MetricField is used for most dimension setting textfields in Draw, our change would render all such texfields to be capable of specifying fractional inches. However, this is a mere hijack of the parsing of user input, the output remains in decimal format. There are several considerations involved in this decision and the most important being that, this change will adhere to the standardization of the textfields' display without affecting other functionalities. Our own preliminary unit tests have shown our change is stable. We conducted further verifications with tests installed on the system without a hitch. How should we move forward with the changes? Do we go ahead and push our changes to gerrit? Cheers, Foo Lai ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Foo Lai Choo license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Inserting a value into a XComponentContext
So what about the following approach:
Reference XComponentContext xContext =
::comphelper::getProcessComponentContext();
::cppu::ContextEntry_Init aContextInfo[] =
{
::cppu::ContextEntry_Init(testkey, uno::Any() ),
}
xNewContext = ::cppu::createComponentContext(aContextInfo,
sizeof(aContextInfo) / sizeof (aHandlerContextInfo[0]), xContext);
Then to get access to the container, I use something like this:
Reference container::XNameContainer xNameContainer( xContext, UNO_QUERY
);
Is this the right approach? Will the delegate ComponentContext work?
Chris
On Mon, Dec 1, 2014 at 12:25 AM, Andrew Pitonyak and...@pitonyak.org
wrote:
Guessing from memory and not east for me to verify at the Moment, but I
thought that the context was read only. I think that of you want to add
values you need to create a new one with the desired named value pairs.
Are you able to inspect an object to see of it supports setting values...
I have done very little in this area and don't remember...
Chris Sherlock chris.sherloc...@gmail.com wrote:
Hi all,
How do you insert a value to be retrieved later into an XComponentContext
reference?
I see there is a XNameContainer, which is created by
comphelper::NameContainer_createInstance(::cppu::UnoTypesal_Int32::get())
or whatever value you want. From here you then do insertByName.
However, how do you then insert this into the component context?
Chris
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Inserting a value into a XComponentContext
Oh, and sorry for the number of emails, but I guess I'm assuming that you
can add a new property key at any point by insertByName()...
Thanks in advance, UNO is a little tricky at this level. At least that's
what I find... from what I can tell, it really comes down to the
cppuhelper::ComponentContext class which implements the XNameContainer
interface. *Please* correct me if I'm wrong :-)
Chris
On Mon, Dec 1, 2014 at 10:29 AM, Chris Sherlock chris.sherloc...@gmail.com
wrote:
So what about the following approach:
Reference XComponentContext xContext =
::comphelper::getProcessComponentContext();
::cppu::ContextEntry_Init aContextInfo[] =
{
::cppu::ContextEntry_Init(testkey, uno::Any() ),
}
xNewContext = ::cppu::createComponentContext(aContextInfo,
sizeof(aContextInfo) / sizeof (aHandlerContextInfo[0]), xContext);
Then to get access to the container, I use something like this:
Reference container::XNameContainer xNameContainer( xContext, UNO_QUERY
);
Is this the right approach? Will the delegate ComponentContext work?
Chris
On Mon, Dec 1, 2014 at 12:25 AM, Andrew Pitonyak and...@pitonyak.org
wrote:
Guessing from memory and not east for me to verify at the Moment, but I
thought that the context was read only. I think that of you want to add
values you need to create a new one with the desired named value pairs.
Are you able to inspect an object to see of it supports setting values...
I have done very little in this area and don't remember...
Chris Sherlock chris.sherloc...@gmail.com wrote:
Hi all,
How do you insert a value to be retrieved later into an XComponentContext
reference?
I see there is a XNameContainer, which is created by
comphelper::NameContainer_createInstance(::cppu::UnoTypesal_Int32::get())
or whatever value you want. From here you then do insertByName.
However, how do you then insert this into the component context?
Chris
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Inserting a value into a XComponentContext
Anything I have done has been in basic, which abstracts ask the hard bits of casting away. Of Han that looks to be correct based on my memory. More specifically, that you add the values (or pad the values) on creation. Chris Sherlock chris.sherloc...@gmail.com wrote: ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLHelper.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 1fd34cd93faf13c30501635b41d01e0fc5606755
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 1 01:18:25 2014 +0100
introduce SAL_FORCEGL and document the variables
SAL_FORCEGL can force OpenGL even if the driver is blacklisted.
Change-Id: Idc763d81fef6dbdf915154995205fbf2b1f060b4
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index daee089..3c08c03 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -401,6 +401,17 @@ bool OpenGLHelper::supportsVCLOpenGL()
bool OpenGLHelper::isVCLOpenGLEnabled()
{
+/*
+ * There are a number of cases that these environment variables cover:
+ * * SAL_FORCEGL forces OpenGL independent of any other option
+ * * SAL_DISABLEGL or a blacklisted driver avoid the use of OpenGL if
SAL_FORCEGL is not set
+ * * SAL_ENABLEGL overrides VCL_HIDE_WINDOWS and the configuration
variable
+ * * the configuration variable is checked if no environment variable is
set
+ */
+static bool bForceOpenGL = !!getenv(SAL_FORCEGL);
+if (bForceOpenGL)
+return true;
+
if (!supportsVCLOpenGL())
return false;
@@ -411,7 +422,6 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
static bool bDuringBuild = getenv(VCL_HIDE_WINDOWS);
if (bDuringBuild !bEnable /* env. enable overrides */)
bEnable = false;
-
else if (officecfg::Office::Common::VCL::UseOpenGL::get())
bEnable = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Inserting a value into a XComponentContext
No stress on the number of mails.
I did not think that you could change a context after it was created... But I
would certainly try if I had a need. I know very little about this specifically.
Chris Sherlock chris.sherloc...@gmail.com wrote:
Oh, and sorry for the number of emails, but I guess I'm assuming that you can
add a new property key at any point by insertByName()...
Thanks in advance, UNO is a little tricky at this level. At least that's what
I find... from what I can tell, it really comes down to the
cppuhelper::ComponentContext class which implements the XNameContainer
interface. *Please* correct me if I'm wrong :-)
Chris
On Mon, Dec 1, 2014 at 10:29 AM, Chris Sherlock chris.sherloc...@gmail.com
wrote:
So what about the following approach:
Reference XComponentContext xContext =
::comphelper::getProcessComponentContext();
::cppu::ContextEntry_Init aContextInfo[] =
{
::cppu::ContextEntry_Init(testkey, uno::Any() ),
}
xNewContext = ::cppu::createComponentContext(aContextInfo,
sizeof(aContextInfo) / sizeof (aHandlerContextInfo[0]), xContext);
Then to get access to the container, I use something like this:
Reference container::XNameContainer xNameContainer( xContext, UNO_QUERY );
Is this the right approach? Will the delegate ComponentContext work?
Chris
On Mon, Dec 1, 2014 at 12:25 AM, Andrew Pitonyak and...@pitonyak.org wrote:
Guessing from memory and not east for me to verify at the Moment, but I
thought that the context was read only. I think that of you want to add values
you need to create a new one with the desired named value pairs.
Are you able to inspect an object to see of it supports setting values...
I have done very little in this area and don't remember...
Chris Sherlock chris.sherloc...@gmail.com wrote:
Hi all,
How do you insert a value to be retrieved later into an XComponentContext
reference?
I see there is a XNameContainer, which is created by
comphelper::NameContainer_createInstance(::cppu::UnoTypesal_Int32::get()) or
whatever value you want. From here you then do insertByName.
However, how do you then insert this into the component context?
Chris
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/qa
starmath/qa/cppunit/mock-visitor.hxx | 56 +--
1 file changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 14398cb2076a88b752430db5e20b36d9b377f62c
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Nov 29 20:48:08 2014 +0900
fix the order of arguments: expected and actual
Change-Id: Ie7c1dce636df2891f1888aa95cec6d37ed0380b4
diff --git a/starmath/qa/cppunit/mock-visitor.hxx
b/starmath/qa/cppunit/mock-visitor.hxx
index 3284f0f..88ca742 100644
--- a/starmath/qa/cppunit/mock-visitor.hxx
+++ b/starmath/qa/cppunit/mock-visitor.hxx
@@ -21,103 +21,103 @@ public:
void Visit( SmTableNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmTableNode should have type NTABLE,
- pNode-GetType(), NTABLE);
+ NTABLE, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmBraceNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmBraceNode should have type NBRACE,
- pNode-GetType(), NBRACE);
+ NBRACE, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmBracebodyNode should have type
NBRACEBODY,
- pNode-GetType(), NBRACEBODY);
+ NBRACEBODY, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmOperNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmOperNode should have type NOPER,
- pNode-GetType(), NOPER);
+ NOPER, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmAlignNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmAlignNode should have type NALIGN,
- pNode-GetType(), NALIGN);
+ NALIGN, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmAttributNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmAttributNode should have type
NATTRIBUT,
- pNode-GetType(), NATTRIBUT);
+ NATTRIBUT, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmFontNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmFontNode should have type NFONT,
- pNode-GetType(), NFONT);
+ NFONT, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmUnHorNode should have type NUNHOR,
- pNode-GetType(), NUNHOR);
+ NUNHOR, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmBinHorNode should have type NBINHOR,
- pNode-GetType(), NBINHOR);
+ NBINHOR, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmBinVerNode should have type NBINVER,
- pNode-GetType(), NBINVER);
+ NBINVER, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmBinDiagonalNode should have type
NBINDIAGONAL,
- pNode-GetType(), NBINDIAGONAL);
+ NBINDIAGONAL, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmSubSupNode should have type NSUBSUP,
- pNode-GetType(), NSUBSUP);
+ NSUBSUP, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmMatrixNode should have type NMATRIX,
- pNode-GetType(), NMATRIX);
+ NMATRIX, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmPlaceNode should have type NPLACE,
- pNode-GetType(), NPLACE);
+ NPLACE, pNode-GetType());
VisitChildren( pNode );
}
void Visit( SmTextNode* pNode ) SAL_OVERRIDE {
CPPUNIT_ASSERT_EQUAL_MESSAGE(SmTextNode should have type
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_adddirect.png |binary icon-themes/breeze/cmd/lc_backcolor.png |binary icon-themes/breeze/cmd/lc_backgroundcolor.png |binary icon-themes/breeze/cmd/lc_bold.png |binary icon-themes/breeze/cmd/lc_centerpara.png|binary icon-themes/breeze/cmd/lc_copy.png |binary icon-themes/breeze/cmd/lc_cut.png |binary icon-themes/breeze/cmd/lc_decrementindent.png |binary icon-themes/breeze/cmd/lc_defaultbullet.png |binary icon-themes/breeze/cmd/lc_defaultnumbering.png |binary icon-themes/breeze/cmd/lc_editdoc.png |binary icon-themes/breeze/cmd/lc_exportdirecttopdf.png |binary icon-themes/breeze/cmd/lc_format_paintbrush.png |binary icon-themes/breeze/cmd/lc_incrementindent.png |binary icon-themes/breeze/cmd/lc_insertannotation.png |binary icon-themes/breeze/cmd/lc_insertbookmark.png|binary icon-themes/breeze/cmd/lc_insertdraw.png|binary icon-themes/breeze/cmd/lc_insertfieldctrl.png |binary icon-themes/breeze/cmd/lc_insertfootnote.png|binary icon-themes/breeze/cmd/lc_insertgraphic.png |binary icon-themes/breeze/cmd/lc_inserthyperlink.png |binary icon-themes/breeze/cmd/lc_insertindexesentry.png|binary icon-themes/breeze/cmd/lc_insertobjectchart.png |binary icon-themes/breeze/cmd/lc_insertobjectstarmath.png |binary icon-themes/breeze/cmd/lc_insertpagenumberfield.png |binary icon-themes/breeze/cmd/lc_insertreferencefield.png |binary icon-themes/breeze/cmd/lc_insertsymbol.png |binary icon-themes/breeze/cmd/lc_inserttable.png |binary icon-themes/breeze/cmd/lc_italic.png|binary icon-themes/breeze/cmd/lc_justifypara.png |binary icon-themes/breeze/cmd/lc_leftpara.png |binary icon-themes/breeze/cmd/lc_open.png |binary icon-themes/breeze/cmd/lc_outlinefont.png |binary icon-themes/breeze/cmd/lc_paste.png |binary icon-themes/breeze/cmd/lc_print.png |binary icon-themes/breeze/cmd/lc_printpreview.png |binary icon-themes/breeze/cmd/lc_recsearch.png |binary icon-themes/breeze/cmd/lc_redo.png |binary icon-themes/breeze/cmd/lc_rightpara.png |binary icon-themes/breeze/cmd/lc_save.png |binary icon-themes/breeze/cmd/lc_saveas.png|binary icon-themes/breeze/cmd/lc_searchdialog.png |binary icon-themes/breeze/cmd/lc_shadowed.png |binary icon-themes/breeze/cmd/lc_spacepara1.png|binary icon-themes/breeze/cmd/lc_spacepara15.png |binary icon-themes/breeze/cmd/lc_spacepara2.png|binary icon-themes/breeze/cmd/lc_spelling.png |binary icon-themes/breeze/cmd/lc_strikeout.png |binary icon-themes/breeze/cmd/lc_subscript.png |binary icon-themes/breeze/cmd/lc_superscript.png |binary icon-themes/breeze/cmd/lc_text.png |binary icon-themes/breeze/cmd/lc_underline.png |binary icon-themes/breeze/cmd/lc_undo.png |binary icon-themes/breeze/cmd/sc_saveas.png|binary icon-themes/breeze/links.txt| 29 55 files changed, 29 insertions(+) New commits: commit ebe2bb47d6718ffc5576bd0b72fc7fcdb96f5968 Author: Yousuf Philips philip...@hotmail.com Date: Mon Dec 1 05:09:31 2014 +0400 BREEZE: added all icons for writer's toolbar Change-Id: I26bc023f918a1b264c6267de7115c8821815647c Reviewed-on: https://gerrit.libreoffice.org/13234 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com diff --git a/icon-themes/breeze/cmd/lc_adddirect.png b/icon-themes/breeze/cmd/lc_adddirect.png new file mode 100644 index 000..47bea63 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_adddirect.png differ diff --git a/icon-themes/breeze/cmd/lc_backcolor.png b/icon-themes/breeze/cmd/lc_backcolor.png new file mode 100644 index 000..cec6c7c Binary files /dev/null and b/icon-themes/breeze/cmd/lc_backcolor.png differ diff --git a/icon-themes/breeze/cmd/lc_backgroundcolor.png b/icon-themes/breeze/cmd/lc_backgroundcolor.png new file mode 100644 index 000..4b9b829 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_backgroundcolor.png differ diff --git a/icon-themes/breeze/cmd/lc_bold.png b/icon-themes/breeze/cmd/lc_bold.png new file mode 100644 index 000..d77e913 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_bold.png differ diff --git a/icon-themes/breeze/cmd/lc_centerpara.png b/icon-themes/breeze/cmd/lc_centerpara.png new file mode 100644 index 000..a5b742e Binary files /dev/null and b/icon-themes/breeze/cmd/lc_centerpara.png differ diff --git a/icon-themes/breeze/cmd/lc_copy.png
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_datefield.png |binary icon-themes/sifr/cmd/lc_formatarea.png|binary icon-themes/sifr/cmd/lc_insertgraphic-alt.png |binary icon-themes/sifr/cmd/lc_insertgraphic.png |binary icon-themes/sifr/cmd/lc_inserttable.png |binary icon-themes/sifr/cmd/lc_strikeout.png |binary icon-themes/sifr/cmd/lc_underline.png |binary icon-themes/sifr/cmd/lc_underlinedouble.png |binary icon-themes/sifr/cmd/sc_defaultnumbering.png |binary icon-themes/sifr/cmd/sc_fontcolor.png |binary icon-themes/sifr/cmd/sc_spacepara1.png|binary icon-themes/sifr/cmd/sc_spacepara15.png |binary icon-themes/sifr/cmd/sc_spacepara2.png|binary icon-themes/sifr/links.txt| 41 ++ 14 files changed, 41 insertions(+) New commits: commit 9ba3c24d045972b6ccc276e575744103e4f7269a Author: Yousuf Philips philip...@hotmail.com Date: Mon Dec 1 03:16:58 2014 +0400 fdo#75256 improving on existing icons and adding entries into links.txt Change-Id: If2dee6f5df6dc3961fbd932b2982ecdaf210fc97 Reviewed-on: https://gerrit.libreoffice.org/13226 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com diff --git a/icon-themes/sifr/cmd/lc_datefield.png b/icon-themes/sifr/cmd/lc_datefield.png index 94c2f70..44ea68a 100644 Binary files a/icon-themes/sifr/cmd/lc_datefield.png and b/icon-themes/sifr/cmd/lc_datefield.png differ diff --git a/icon-themes/sifr/cmd/lc_formatarea.png b/icon-themes/sifr/cmd/lc_formatarea.png index f0cfd93..e0b9519 100644 Binary files a/icon-themes/sifr/cmd/lc_formatarea.png and b/icon-themes/sifr/cmd/lc_formatarea.png differ diff --git a/icon-themes/sifr/cmd/lc_insertgraphic-alt.png b/icon-themes/sifr/cmd/lc_insertgraphic-alt.png new file mode 100644 index 000..40c2a35 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertgraphic-alt.png differ diff --git a/icon-themes/sifr/cmd/lc_insertgraphic.png b/icon-themes/sifr/cmd/lc_insertgraphic.png index 40c2a35..a751fe3 100644 Binary files a/icon-themes/sifr/cmd/lc_insertgraphic.png and b/icon-themes/sifr/cmd/lc_insertgraphic.png differ diff --git a/icon-themes/sifr/cmd/lc_inserttable.png b/icon-themes/sifr/cmd/lc_inserttable.png index fe240c0..825109a 100644 Binary files a/icon-themes/sifr/cmd/lc_inserttable.png and b/icon-themes/sifr/cmd/lc_inserttable.png differ diff --git a/icon-themes/sifr/cmd/lc_strikeout.png b/icon-themes/sifr/cmd/lc_strikeout.png index 6947529..9d6c650 100644 Binary files a/icon-themes/sifr/cmd/lc_strikeout.png and b/icon-themes/sifr/cmd/lc_strikeout.png differ diff --git a/icon-themes/sifr/cmd/lc_underline.png b/icon-themes/sifr/cmd/lc_underline.png index ddbf79c..e562b70 100644 Binary files a/icon-themes/sifr/cmd/lc_underline.png and b/icon-themes/sifr/cmd/lc_underline.png differ diff --git a/icon-themes/sifr/cmd/lc_underlinedouble.png b/icon-themes/sifr/cmd/lc_underlinedouble.png index 280fe67..cbc7918 100644 Binary files a/icon-themes/sifr/cmd/lc_underlinedouble.png and b/icon-themes/sifr/cmd/lc_underlinedouble.png differ diff --git a/icon-themes/sifr/cmd/sc_defaultnumbering.png b/icon-themes/sifr/cmd/sc_defaultnumbering.png index 4017000..f39efc8 100644 Binary files a/icon-themes/sifr/cmd/sc_defaultnumbering.png and b/icon-themes/sifr/cmd/sc_defaultnumbering.png differ diff --git a/icon-themes/sifr/cmd/sc_fontcolor.png b/icon-themes/sifr/cmd/sc_fontcolor.png index f967be7..483a964 100644 Binary files a/icon-themes/sifr/cmd/sc_fontcolor.png and b/icon-themes/sifr/cmd/sc_fontcolor.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara1.png b/icon-themes/sifr/cmd/sc_spacepara1.png index 7f465a6..0b730a7 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara1.png and b/icon-themes/sifr/cmd/sc_spacepara1.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara15.png b/icon-themes/sifr/cmd/sc_spacepara15.png index 67840dc..8da1093 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara15.png and b/icon-themes/sifr/cmd/sc_spacepara15.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara2.png b/icon-themes/sifr/cmd/sc_spacepara2.png index 167e511b..c016b96 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara2.png and b/icon-themes/sifr/cmd/sc_spacepara2.png differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 3ac2218..2dc7364 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -5,6 +5,47 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png +# Horizontal Text Alignment (align* is in calc and *para is used in writer) +cmd/lc_alignleft.png cmd/lc_leftpara.png +cmd/sc_alignleft.png cmd/sc_leftpara.png +cmd/lc_alignhorizontalcenter.png cmd/lc_centerpara.png +cmd/sc_alignhorizontalcenter.png cmd/sc_centerpara.png +cmd/lc_alignright.png cmd/lc_rightpara.png
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_alignbottom.png |binary icon-themes/breeze/cmd/lc_aligntop.png |binary icon-themes/breeze/cmd/lc_alignverticalcenter.png |binary icon-themes/breeze/cmd/lc_controlcodes.png |binary icon-themes/breeze/cmd/lc_datadatapilotrun.png |binary icon-themes/breeze/cmd/lc_datafilterautofilter.png |binary icon-themes/breeze/cmd/lc_datafilterspecialfilter.png |binary icon-themes/breeze/cmd/lc_datafilterstandardfilter.png |binary icon-themes/breeze/cmd/lc_datasort.png |binary icon-themes/breeze/cmd/lc_deletecolumns.png|binary icon-themes/breeze/cmd/lc_deleterows.png |binary icon-themes/breeze/cmd/lc_entirecolumn.png |binary icon-themes/breeze/cmd/lc_entirerow.png|binary icon-themes/breeze/cmd/lc_framelinecolor.png |binary icon-themes/breeze/cmd/lc_insertcolumns.png|binary icon-themes/breeze/cmd/lc_insertrows.png |binary icon-themes/breeze/cmd/lc_linestyle.png|binary icon-themes/breeze/cmd/lc_mergecells.png |binary icon-themes/breeze/cmd/lc_paralefttoright.png |binary icon-themes/breeze/cmd/lc_pararighttoleft.png |binary icon-themes/breeze/cmd/lc_setborderstyle.png |binary icon-themes/breeze/cmd/lc_sortascending.png|binary icon-themes/breeze/cmd/lc_sortdescending.png |binary icon-themes/breeze/cmd/lc_tablesort.png|binary icon-themes/breeze/cmd/lc_togglemergecells.png |binary icon-themes/breeze/cmd/lc_wraptext.png |binary icon-themes/breeze/links.txt | 28 +++-- 27 files changed, 25 insertions(+), 3 deletions(-) New commits: commit 1cbab726772e3c0eba74202043699584a00eb931 Author: Yousuf Philips philip...@hotmail.com Date: Mon Dec 1 09:58:45 2014 +0400 BREEZE: add most icons for calc's toolbar Change-Id: I25da362f2348d4315ede9dfffb6454f9170f136b Reviewed-on: https://gerrit.libreoffice.org/13235 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com diff --git a/icon-themes/breeze/cmd/lc_alignbottom.png b/icon-themes/breeze/cmd/lc_alignbottom.png new file mode 100644 index 000..e7fbd00 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_alignbottom.png differ diff --git a/icon-themes/breeze/cmd/lc_aligntop.png b/icon-themes/breeze/cmd/lc_aligntop.png new file mode 100644 index 000..ec430ad9 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_aligntop.png differ diff --git a/icon-themes/breeze/cmd/lc_alignverticalcenter.png b/icon-themes/breeze/cmd/lc_alignverticalcenter.png new file mode 100644 index 000..fe8b3d5 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_alignverticalcenter.png differ diff --git a/icon-themes/breeze/cmd/lc_controlcodes.png b/icon-themes/breeze/cmd/lc_controlcodes.png new file mode 100644 index 000..d04c539 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_controlcodes.png differ diff --git a/icon-themes/breeze/cmd/lc_datadatapilotrun.png b/icon-themes/breeze/cmd/lc_datadatapilotrun.png new file mode 100644 index 000..464f7ef Binary files /dev/null and b/icon-themes/breeze/cmd/lc_datadatapilotrun.png differ diff --git a/icon-themes/breeze/cmd/lc_datafilterautofilter.png b/icon-themes/breeze/cmd/lc_datafilterautofilter.png new file mode 100644 index 000..fdb0658 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_datafilterautofilter.png differ diff --git a/icon-themes/breeze/cmd/lc_datafilterspecialfilter.png b/icon-themes/breeze/cmd/lc_datafilterspecialfilter.png new file mode 100644 index 000..ff3c4bc Binary files /dev/null and b/icon-themes/breeze/cmd/lc_datafilterspecialfilter.png differ diff --git a/icon-themes/breeze/cmd/lc_datafilterstandardfilter.png b/icon-themes/breeze/cmd/lc_datafilterstandardfilter.png new file mode 100644 index 000..53d81c8 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_datafilterstandardfilter.png differ diff --git a/icon-themes/breeze/cmd/lc_datasort.png b/icon-themes/breeze/cmd/lc_datasort.png new file mode 100644 index 000..c6cbdc6 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_datasort.png differ diff --git a/icon-themes/breeze/cmd/lc_deletecolumns.png b/icon-themes/breeze/cmd/lc_deletecolumns.png new file mode 100644 index 000..892a72a Binary files /dev/null and b/icon-themes/breeze/cmd/lc_deletecolumns.png differ diff --git a/icon-themes/breeze/cmd/lc_deleterows.png b/icon-themes/breeze/cmd/lc_deleterows.png new file mode 100644 index 000..39e9b14 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_deleterows.png differ diff --git a/icon-themes/breeze/cmd/lc_entirecolumn.png b/icon-themes/breeze/cmd/lc_entirecolumn.png new file mode 100644 index 000..f7ea915 Binary files /dev/null and
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr
icon-themes/sifr/links.txt | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit b458fde02bbfe17699515cca5c819c2e2304d9fb Author: Yousuf Philips philip...@hotmail.com Date: Sat Nov 29 13:00:32 2014 +0400 fdo#86738 add links.txt references to next and previous buttons Change-Id: I04514498e9f6466416d08eb0e1736dcebe931e71 Reviewed-on: https://gerrit.libreoffice.org/13186 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com (cherry picked from commit 401b7c8d7f0d46094e8bab7db9b2df8c74c5b876) Reviewed-on: https://gerrit.libreoffice.org/13236 diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 5c8bad3..3ac2218 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1,6 +1,16 @@ +# File Menu cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png + +# Print Preview Toolbar cmd/lc_showsinglepage.png cmd/lc_adddirect.png +cmd/sc_showsinglepage.png cmd/sc_adddirect.png + +# Find Toolbar +cmd/lc_scrolltonext.png cmd/lc_downsearch.png +cmd/sc_scrolltonext.png cmd/sc_downsearch.png +cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png +cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png -# paragraph line spacing +# paragraph line spacing drop down cmd/lc_linespacing.png cmd/lc_spacepara15.png cmd/sc_linespacing.png cmd/sc_spacepara15.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr
icon-themes/sifr/cmd/lc_datefield.png |binary icon-themes/sifr/cmd/lc_formatarea.png|binary icon-themes/sifr/cmd/lc_insertgraphic-alt.png |binary icon-themes/sifr/cmd/lc_insertgraphic.png |binary icon-themes/sifr/cmd/lc_inserttable.png |binary icon-themes/sifr/cmd/lc_strikeout.png |binary icon-themes/sifr/cmd/lc_underline.png |binary icon-themes/sifr/cmd/lc_underlinedouble.png |binary icon-themes/sifr/cmd/sc_defaultnumbering.png |binary icon-themes/sifr/cmd/sc_fontcolor.png |binary icon-themes/sifr/cmd/sc_spacepara1.png|binary icon-themes/sifr/cmd/sc_spacepara15.png |binary icon-themes/sifr/cmd/sc_spacepara2.png|binary icon-themes/sifr/links.txt| 41 ++ 14 files changed, 41 insertions(+) New commits: commit d00f00e4fee008f5cd56826b065f4a438ddb0b6e Author: Yousuf Philips philip...@hotmail.com Date: Mon Dec 1 03:16:58 2014 +0400 fdo#75256 improving on existing icons and adding entries into links.txt Change-Id: If2dee6f5df6dc3961fbd932b2982ecdaf210fc97 Reviewed-on: https://gerrit.libreoffice.org/13226 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com (cherry picked from commit 9ba3c24d045972b6ccc276e575744103e4f7269a) Reviewed-on: https://gerrit.libreoffice.org/13237 diff --git a/icon-themes/sifr/cmd/lc_datefield.png b/icon-themes/sifr/cmd/lc_datefield.png index 94c2f70..44ea68a 100644 Binary files a/icon-themes/sifr/cmd/lc_datefield.png and b/icon-themes/sifr/cmd/lc_datefield.png differ diff --git a/icon-themes/sifr/cmd/lc_formatarea.png b/icon-themes/sifr/cmd/lc_formatarea.png index f0cfd93..e0b9519 100644 Binary files a/icon-themes/sifr/cmd/lc_formatarea.png and b/icon-themes/sifr/cmd/lc_formatarea.png differ diff --git a/icon-themes/sifr/cmd/lc_insertgraphic-alt.png b/icon-themes/sifr/cmd/lc_insertgraphic-alt.png new file mode 100644 index 000..40c2a35 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertgraphic-alt.png differ diff --git a/icon-themes/sifr/cmd/lc_insertgraphic.png b/icon-themes/sifr/cmd/lc_insertgraphic.png index 40c2a35..a751fe3 100644 Binary files a/icon-themes/sifr/cmd/lc_insertgraphic.png and b/icon-themes/sifr/cmd/lc_insertgraphic.png differ diff --git a/icon-themes/sifr/cmd/lc_inserttable.png b/icon-themes/sifr/cmd/lc_inserttable.png index fe240c0..825109a 100644 Binary files a/icon-themes/sifr/cmd/lc_inserttable.png and b/icon-themes/sifr/cmd/lc_inserttable.png differ diff --git a/icon-themes/sifr/cmd/lc_strikeout.png b/icon-themes/sifr/cmd/lc_strikeout.png index 6947529..9d6c650 100644 Binary files a/icon-themes/sifr/cmd/lc_strikeout.png and b/icon-themes/sifr/cmd/lc_strikeout.png differ diff --git a/icon-themes/sifr/cmd/lc_underline.png b/icon-themes/sifr/cmd/lc_underline.png index ddbf79c..e562b70 100644 Binary files a/icon-themes/sifr/cmd/lc_underline.png and b/icon-themes/sifr/cmd/lc_underline.png differ diff --git a/icon-themes/sifr/cmd/lc_underlinedouble.png b/icon-themes/sifr/cmd/lc_underlinedouble.png index 280fe67..cbc7918 100644 Binary files a/icon-themes/sifr/cmd/lc_underlinedouble.png and b/icon-themes/sifr/cmd/lc_underlinedouble.png differ diff --git a/icon-themes/sifr/cmd/sc_defaultnumbering.png b/icon-themes/sifr/cmd/sc_defaultnumbering.png index 4017000..f39efc8 100644 Binary files a/icon-themes/sifr/cmd/sc_defaultnumbering.png and b/icon-themes/sifr/cmd/sc_defaultnumbering.png differ diff --git a/icon-themes/sifr/cmd/sc_fontcolor.png b/icon-themes/sifr/cmd/sc_fontcolor.png index f967be7..483a964 100644 Binary files a/icon-themes/sifr/cmd/sc_fontcolor.png and b/icon-themes/sifr/cmd/sc_fontcolor.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara1.png b/icon-themes/sifr/cmd/sc_spacepara1.png index 7f465a6..0b730a7 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara1.png and b/icon-themes/sifr/cmd/sc_spacepara1.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara15.png b/icon-themes/sifr/cmd/sc_spacepara15.png index 67840dc..8da1093 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara15.png and b/icon-themes/sifr/cmd/sc_spacepara15.png differ diff --git a/icon-themes/sifr/cmd/sc_spacepara2.png b/icon-themes/sifr/cmd/sc_spacepara2.png index 167e511b..c016b96 100644 Binary files a/icon-themes/sifr/cmd/sc_spacepara2.png and b/icon-themes/sifr/cmd/sc_spacepara2.png differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 3ac2218..2dc7364 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -5,6 +5,47 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png +# Horizontal Text Alignment (align* is in calc and *para is used in writer) +cmd/lc_alignleft.png cmd/lc_leftpara.png +cmd/sc_alignleft.png cmd/sc_leftpara.png +cmd/lc_alignhorizontalcenter.png
[Libreoffice-commits] core.git: 4 commits - include/vcl sc/qa sc/source vcl/inc vcl/opengl vcl/source
include/vcl/opengl/OpenGLContext.hxx |4
sc/qa/unit/ucalc_formula.cxx | 14 ++
sc/source/core/tool/token.cxx|4
sc/source/ui/dbgui/PivotLayoutDialog.cxx |3 +++
vcl/inc/openglgdiimpl.hxx|4 +++-
vcl/opengl/gdiimpl.cxx | 22 +++---
vcl/source/opengl/OpenGLContext.cxx | 12
7 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit 96ec51292301a105effacfcceec44f696ee6e0f0
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Dec 1 05:54:07 2014 +0100
add test case for fdo#86518
Change-Id: I297ba5fe7d218ef3bfce6c95c54f446038b7fdca
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 90e906b..56f5f8c 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2582,6 +2582,20 @@ void Test::testFormulaRefUpdateNameDeleteRow()
aExpr = pCode-CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString($B$2:$B$4), aExpr);
+m_pDoc-InsertTab(1, test2);
+
+ScMarkData aMark2;
+aMark2.SelectOneTable(1);
+rFunc.DeleteCells(ScRange(0,2,1,MAXCOL,2,1), aMark2, DEL_CELLSUP, true,
true);
+
+pName = m_pDoc-GetRangeName()-findByUpperName(MYRANGE);
+CPPUNIT_ASSERT(pName);
+pCode = pName-GetCode();
+
+aExpr = pCode-CreateString(aCxt, ScAddress(0,0,0));
+CPPUNIT_ASSERT_EQUAL(OUString($B$2:$B$4), aExpr);
+
+m_pDoc-DeleteTab(1);
m_pDoc-DeleteTab(0);
}
commit 4e3baa08cbaf1e15ef668d92878d1f6f8eba1303
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Dec 1 04:05:46 2014 +0100
avoid modifying range name references that are not affected, fdo#86518
Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b0bfb99..74b30ad 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3060,6 +3060,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
// column range of the reference is not entirely in
the deleted column range.
break;
+if (aAbs.aStart.Tab() rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
ScRange aDeleted = rCxt.maRange;
aDeleted.aStart.IncRow(rCxt.mnRowDelta);
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
commit f1cdad3253730c593953b91279d17c8a4590fed9
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Dec 1 02:49:59 2014 +0100
For external data sources this variable can be null, fdo#83534
Change-Id: I8c47cf078b4772fcdba0993880740c22114f1b45
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 1d572b8..3d3a191 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -387,6 +387,9 @@ void ScPivotLayoutDialog::ItemInserted(ScItemValue*
pItemValue, ScPivotLayoutTre
void ScPivotLayoutDialog::UpdateSourceRange()
{
+if (!maPivotTableObject.GetSheetDesc())
+ return;
+
ScSheetSourceDesc aSourceSheet = *maPivotTableObject.GetSheetDesc();
if (mpSourceRadioNamedRange-IsChecked())
commit 8eeb02dcc1a4bc99b083b1a591b4a70003a1604f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Sun Nov 30 04:55:46 2014 +0100
use boost::shared_ptr instead of manual ref counting
Change-Id: I3c2ed9b5641202ff965c3a0c833c8201b2b1548b
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index ebfa6ff..7931f4b 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -175,9 +175,6 @@ public:
bool init( HDC hDC, HWND hWnd );
#endif
-void AddRef();
-void DeRef();
-
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -222,7 +219,6 @@ private:
SystemChildWindow* m_pChildWindow;
boost::scoped_ptrSystemChildWindow m_pChildWindowGC;
bool mbInitialized;
-int mnRefCount;
bool mbRequestLegacyContext;
bool mbUseDoubleBufferedRendering;
bool mbRequestVirtualDevice;
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 83c5bdb..bc813f1 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -29,6 +29,8 @@
#include tools/poly.hxx
#include vcl/opengl/OpenGLContext.hxx
+#include boost/shared_ptr.hpp
+
class SalFrame;
class SalVirtualDevice;
@@ -36,7 +38,7 @@ class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public
SalGraphicsImpl
{
protected:
-OpenGLContext* mpContext;
+boost::shared_ptrOpenGLContext mpContext;
// clipping
vcl::Region maClipRegion;
diff --git a/vcl/opengl/gdiimpl.cxx
RE: dead code in sc/source/filter/excel/xeformula.cxx?
Hi Eike, Are you referring XclExpFmlaCompImpl::PrepareFunction() XclExpFmlaCompImpl::FinishFunction() XclExpFmlaCompImpl::AppendDefaultParam() XclExpFmlaCompImpl::AppendTrailingParam() ? These are used for the BIFF export. Yes, e.g. in XclExpFmlaCompImpl::AppendDefaultParam() there is a line if (GetOutput() == EXC_OUTPUT_XML_2007), which IMHO will never be true and there are some if (GetOutput() != EXC_OUTPUT_XML_2007), which IMHO will never be false. Possibly there is more. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sc/source
sc/source/core/tool/token.cxx|4
sc/source/ui/dbgui/PivotLayoutDialog.cxx |3 +++
2 files changed, 7 insertions(+)
New commits:
commit 7ede454ecf9650a4d023e5eccd397f0991061df3
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Dec 1 02:49:59 2014 +0100
For external data sources this variable can be null, fdo#83534
Change-Id: I8c47cf078b4772fcdba0993880740c22114f1b45
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 1d572b8..3d3a191 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -387,6 +387,9 @@ void ScPivotLayoutDialog::ItemInserted(ScItemValue*
pItemValue, ScPivotLayoutTre
void ScPivotLayoutDialog::UpdateSourceRange()
{
+if (!maPivotTableObject.GetSheetDesc())
+ return;
+
ScSheetSourceDesc aSourceSheet = *maPivotTableObject.GetSheetDesc();
if (mpSourceRadioNamedRange-IsChecked())
commit 9eb40f6ab2cd7798a9e9b61cfd6e5b65517123ac
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Dec 1 04:05:46 2014 +0100
avoid modifying range name references that are not affected, fdo#86518
Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 77f7cc2..a2721a2 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3059,6 +3059,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
// column range of the reference is not entirely in
the deleted column range.
break;
+if (aAbs.aStart.Tab() rCxt.maRange.aEnd.Tab() ||
aAbs.aEnd.Tab() rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
ScRange aDeleted = rCxt.maRange;
aDeleted.aStart.IncRow(rCxt.mnRowDelta);
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source forms/source formula/source fpicker/source framework/source includ
basctl/source/basicide/basicbox.cxx | 12 - basctl/source/basicide/baside2b.cxx |2 basctl/source/basicide/bastypes.cxx |2 chart2/source/controller/main/ElementSelector.cxx |4 cui/source/customize/macropg.cxx |2 cui/source/dialogs/SpellDialog.cxx|6 cui/source/dialogs/colorpicker.cxx|2 cui/source/dialogs/hangulhanjadlg.cxx |2 cui/source/options/connpooloptions.cxx|2 cui/source/options/optcolor.cxx |2 cui/source/options/optpath.cxx|2 cui/source/options/treeopt.cxx|2 cui/source/tabpages/autocdlg.cxx |2 cui/source/tabpages/numfmt.cxx|2 dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 dbaccess/source/ui/app/AppView.cxx|4 dbaccess/source/ui/browser/brwview.cxx|2 dbaccess/source/ui/browser/dataview.cxx |8 - dbaccess/source/ui/control/RelationControl.cxx|4 dbaccess/source/ui/control/TableGrantCtrl.cxx |4 dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 dbaccess/source/ui/misc/WTypeSelect.cxx |4 dbaccess/source/ui/querydesign/JoinTableView.cxx |6 dbaccess/source/ui/querydesign/QueryDesignView.cxx|2 dbaccess/source/ui/querydesign/TableWindow.cxx|4 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |2 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |4 dbaccess/source/ui/querydesign/querycontainerwindow.cxx |2 dbaccess/source/ui/relationdesign/RelationDesignView.cxx |2 dbaccess/source/ui/tabledesign/TEditControl.cxx |2 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx |2 dbaccess/source/ui/tabledesign/TableDesignView.cxx|2 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |2 desktop/source/deployment/gui/dp_gui_dialog2.cxx |4 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |4 extensions/source/bibliography/bibcont.cxx|2 extensions/source/bibliography/toolbar.cxx|4 extensions/source/propctrlr/browserlistbox.cxx|4 extensions/source/propctrlr/browserview.cxx |2 extensions/source/propctrlr/commoncontrol.cxx |2 extensions/source/propctrlr/standardcontrol.cxx |6 extensions/source/propctrlr/standardcontrol.hxx |2 extensions/source/propctrlr/usercontrol.cxx |2 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |4 forms/source/richtext/richtextvclcontrol.cxx |4 formula/source/ui/dlg/formula.cxx |4 formula/source/ui/dlg/funcpage.cxx|4 formula/source/ui/dlg/funcutl.cxx |6 fpicker/source/office/iodlg.cxx |4 framework/source/uielement/comboboxtoolbarcontroller.cxx |6 framework/source/uielement/edittoolbarcontroller.cxx |2 framework/source/uielement/spinfieldtoolbarcontroller.cxx |2 include/vcl/event.hxx | 51 --- reportdesign/source/ui/dlg/AddField.cxx |2 reportdesign/source/ui/dlg/CondFormat.cxx |4 reportdesign/source/ui/report/DesignView.cxx |2 sc/source/ui/app/inputwin.cxx |6 sc/source/ui/cctrl/checklistmenu.cxx |2 sc/source/ui/condformat/condformatdlgentry.cxx|2 sc/source/ui/miscdlgs/acredlin.cxx|2 sc/source/ui/miscdlgs/anyrefdg.cxx|4 sc/source/ui/navipi/navipi.cxx| 10 - sc/source/ui/navipi/scenwnd.cxx |4 sc/source/ui/pagedlg/tphfedit.cxx |4 sc/source/ui/view/gridwin.cxx | 10 - sd/source/ui/animations/CustomAnimationDialog.cxx |4 sd/source/ui/dlg/RemoteDialogClientBox.cxx|4 sd/source/ui/dlg/docprev.cxx |2 sd/source/ui/view/viewshel.cxx|2 sfx2/source/appl/newhelp.cxx | 28 ++-- sfx2/source/control/thumbnailviewitem.cxx |4 sfx2/source/dialog/backingwindow.cxx |4 sfx2/source/dialog/basedlgs.cxx | 12 - sfx2/source/dialog/dockwin.cxx|6
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyInteresting |DifficultyInteresting |SkillCpp target:4.4.0 |SkillCpp target:4.4.0 ||target:4.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
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tobias Madl committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=14596452e781f6a66bcc63b0c447c852df1f2896 fdo#84938: replace EVENT_ constants with enum It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 'libreoffice-4-3' - 3 commits - include/oox oox/source sd/qa sw/qa writerfilter/source
include/oox/drawingml/shape.hxx|2
oox/source/drawingml/shape.cxx | 12 +-
sd/qa/unit/data/pptx/ShapeLineProperties.pptx |binary
sd/qa/unit/data/pptx/bnc904423.pptx|binary
sd/qa/unit/import-tests.cxx| 127 +
sw/qa/extras/rtfimport/data/fdo72031.rtf |1
sw/qa/extras/rtfimport/rtfimport.cxx |9 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 26 +++--
8 files changed, 163 insertions(+), 14 deletions(-)
New commits:
commit 0996041998249b56f36ac579ae4c7968b70d5371
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 30 14:31:39 2014 +0100
PPTX import: fix import of shape line properties defined by theme
See also:
81cd386facedfbb15be6dffc10351262abf733f3
(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index b36584a..8024af7 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -249,6 +249,7 @@ protected:
TextBodyPtr mpTextBody;
LinePropertiesPtr mpLinePropertiesPtr;
+LinePropertiesPtr mpShapeRefLinePropPtr;
FillPropertiesPtr mpFillPropertiesPtr;
FillPropertiesPtr mpShapeRefFillPropPtr;
GraphicPropertiesPtrmpGraphicPropertiesPtr;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 56f3dc0..93e9789 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -93,6 +93,7 @@ namespace oox { namespace drawingml {
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
: mbIsChild( false )
, mpLinePropertiesPtr( new LineProperties )
+, mpShapeRefLinePropPtr( new LineProperties )
, mpFillPropertiesPtr( new FillProperties )
, mpShapeRefFillPropPtr( new FillProperties )
, mpGraphicPropertiesPtr( new GraphicProperties )
@@ -123,6 +124,7 @@ Shape::Shape( const ShapePtr pSourceShape )
, mbIsChild( pSourceShape-mbIsChild )
, mpTextBody(pSourceShape-mpTextBody)
, mpLinePropertiesPtr( pSourceShape-mpLinePropertiesPtr )
+, mpShapeRefLinePropPtr( pSourceShape-mpShapeRefLinePropPtr )
, mpFillPropertiesPtr( pSourceShape-mpFillPropertiesPtr )
, mpShapeRefFillPropPtr( pSourceShape-mpShapeRefFillPropPtr )
, mpGraphicPropertiesPtr( pSourceShape-mpGraphicPropertiesPtr )
@@ -304,7 +306,7 @@ void Shape::applyShapeReference( const Shape
rReferencedShape, bool bUseText )
else
mpTextBody.reset();
maShapeProperties = rReferencedShape.maShapeProperties;
-mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
+mpShapeRefLinePropPtr = LinePropertiesPtr( new LineProperties(
*rReferencedShape.mpLinePropertiesPtr.get() ) );
mpShapeRefFillPropPtr = FillPropertiesPtr( new FillProperties(
*rReferencedShape.mpFillPropertiesPtr.get() ) );
mpCustomShapePropertiesPtr = CustomShapePropertiesPtr( new
CustomShapeProperties( *rReferencedShape.mpCustomShapePropertiesPtr.get() ) );
mpTablePropertiesPtr = table::TablePropertiesPtr(
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties(
*rReferencedShape.mpTablePropertiesPtr.get() ) : NULL );
@@ -586,6 +588,7 @@ Reference XShape Shape::createAndInsert(
// First apply reference shape's properties (shape on the master slide)
aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
+aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
if( pTheme )
{
diff --git a/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
new file mode 100644
index 000..36ece8c
Binary files /dev/null and b/sd/qa/unit/data/pptx/ShapeLineProperties.pptx
differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b92b475..316740e 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -31,6 +31,9 @@
#include svx/svdoole2.hxx
#include svx/svdotable.hxx
#include svx/xflclit.hxx
+#include svx/xlineit0.hxx
+#include svx/xlnclit.hxx
+#include svx/xlnwtit.hxx
#include animations/animationnodehelper.hxx
#include sax/tools/converter.hxx
@@ -93,6 +96,7 @@ public:
void testBnc584721_4();
void testFdo79731();
void testBnc904423();
+void testShapeLineStyle();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -127,6 +131,7 @@ public:
CPPUNIT_TEST(testBnc584721_4);
CPPUNIT_TEST(testFdo79731);
CPPUNIT_TEST(testBnc904423);
+CPPUNIT_TEST(testShapeLineStyle);
CPPUNIT_TEST_SUITE_END();
};
@@ -1171,6 +1176,74 @@ void SdFiltersTest::testBnc904423()
xDocShRef-DoClose();
}
Re: [Libreoffice-qa] TDF Bugzilla 4.4.6 test install
On Sat, Nov 29, 2014 at 6:53 PM, bfoman bfo.bugm...@spamgourmet.com wrote: You just need to run collectstats.pl --regenerate. Let's see... that took about 9 minutes. The stats for the last 7 months will look a little off, of course, as this is a dump from April ;-) Robinson Tryon wrote - personal Tags - available, but all saved searches using tags at the bottom are gone in my case My (one) saved search is working for me. Not sure what you mean by using tags at the bottom. You split the words wrong :) - my saved searches using tags at bottom of the page are gone. I can't recollect if those have been listed on previous test install. I think yes, not sure though. Are they listed in the saved-searches tab? The visibility can be toggled on/off -- see if that's the issue for you: https://bugzilla-test.documentfoundation.org/userprefs.cgi?tab=saved-searches No, all of them are gone from the list. Hmm, I guess I might have to go spelunking in the database dump to see if they're store in there somewhere. Could you please give me detailed information (a separate email is fine) about the specific searches (params, url strings, etc..)? Please make sure to only include searches that were present in April. Robinson Tryon wrote IMHO those messages should be put where they belong: [...] That all sounds pretty reasonable to me. Want to submit a patch? :-) Code's up on our Gerrit here: https://gerrit.libreoffice.org/#/projects/bugzilla Could do, but I need to know how do you want to customize TDF Bugzilla. Whether to change original files or put changes into template/en/custom directory. So far, I've just been modifying the original files directly. That seems like the easiest mechanism, and will hopefully make it clearer when we rebase on top of a new version of Bugzilla: (e.g. https://gerrit.libreoffice.org/gitweb?p=bugzilla.git;a=commit;h=fe9a516841208ce66ebcd9818d12c7f31ff80646) Also please remember that template files are Bugzilla code (not just UI strings) and have to be updated when changed after upgrade. Indeed, indeed. That's why I think that modifying the original files will make it clearest what needs to change whenever we upgrade and rebase our patches. https://gerrit.libreoffice.org/#/projects/bugzilla - The page you requested was not found, or you do not have permission to view this page. Sorry, couldn't test my urls when gerrit was down :P Try here: https://gerrit.libreoffice.org/#/admin/projects/bugzilla At https://gerrit.libreoffice.org/gitweb?p=bugzilla.git;a=tree;hb=HEAD last commit message is Bump version to 4.4.4 and at test install you are running 4.4.6. For each version of Bugzilla we deploy (e.g. Bugzilla 4.4.6), we create a tdf- branch in the repo (e.g. tdf-4.4.6). We rebase (actually more like cherry-pick, as we don't want to destroy the old branch) all of our local changes on top of the new branch, and deploy based on that tip. I made some notes here: https://wiki.documentfoundation.org/QA/Bugzilla/Development BTW: are you sure that you want to run TDF Bugzilla on nginx? Do you have better performance? Bugzilla's developers are keen to tune up its performance and enable some features on Apache as default webserver (mod_perl or mod_headers, mod_expires, mod_env modules). I'm not wedded to nginx, but some of the preliminary work for the migration was tested against nginx, so I continued using it. In my testing of Bugzilla, I tried both nginx and Apache, and both worked quite well for me. I believe that a fair portion of TDF infra currently runs on nginx, so unless you've seen some significant performance differences, I'm inclined to use nginx for now. Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ 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] TDF Bugzilla 4.4.6 test install
Hi! Robinson Tryon wrote On Sat, Nov 29, 2014 at 6:53 PM, bfoman lt; bfo.bugmail@ gt; wrote: You just need to run collectstats.pl --regenerate. Let's see... that took about 9 minutes. So it could take 30 minutes when done in 2015 for more than 30k LO bugs... Test dump is under 10k bugs. Best regards. -- View this message in context: http://nabble.documentfoundation.org/TDF-Bugzilla-4-4-6-test-install-tp4130484p4130991.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-qa] Prioritizing Misprioritized NEW Bugs
Hi All, In order to increase confidence in our bug tracking system, it'd be great if we could start prioritizing NEW (and other) bugs correctly - starting with those that are WAY over-prioritized. Guidance: https://wiki.documentfoundation.org/images/0/06/Prioritizing_Bugs_Flowchart.jpg Comments: Remember to leave a comment: (1) Thanking user for reporting; (2) letting them know you're just prioritizing; (3) ask them nicely not to play around with the settings :) *Blockers - *Note that blockers are *extremely rare* - so probably all of these are misprioritized https://bugs.freedesktop.org/buglist.cgi?bug_severity=blockerbug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDlist_id=499918product=LibreOfficequery_format=advanced *Critical - *Should only apply to essentially blockers or severe data loss (in rare occasions common features behaving poorly but that's rare) https://bugs.freedesktop.org/buglist.cgi?bug_severity=criticalbug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDlist_id=499923product=LibreOfficequery_format=advanced *Major - *Also pretty rare, data loss, crashers, main features not working (like inability to print on multiple printers, etc . . .) https://bugs.freedesktop.org/buglist.cgi?bug_severity=majorbug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDlist_id=499923product=LibreOfficequery_format=advanced Most of these bugs will be normal or even minor bugs (inability to create professional quality work or slowing down the ability). Some users will likely respond poorly - we should handle these as nice as can be but if they refuse to cooperate, feel free to ping me. Lastly - with crashers/data loss, a fresh test with current version is always appreciated. Thanks everyone for the incredible work! Best, Joel ___ 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 86868] Arabic enteries don't appear in Text Box
https://bugs.freedesktop.org/show_bug.cgi?id=86868 Faisal Menawer fmalota...@kacst.edu.sa changed: What|Removed |Added Attachment #110257|text/plain |application/pdf mime type|| --- Comment #1 from Faisal Menawer fmalota...@kacst.edu.sa --- Comment on attachment 110257 -- https://bugs.freedesktop.org/attachment.cgi?id=110257 PDF file with Text Box entries fix the attachment -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|75137 | -- 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 75137] Can't Move Cursor Between Footnotes with Up/Down Arrow Keys. Need to Click with Mouse
https://bugs.freedesktop.org/show_bug.cgi?id=75137 tommy27 ba...@quipo.it changed: What|Removed |Added Blocks|65675 |75025 --- Comment #17 from tommy27 ba...@quipo.it --- there's nothing odd. a test file should have been there from beginning. it's necessary to speed up the QA job so we don't have to recreate from scratch such a file. if users create complete reports with clear descriptions and test files and/or screenshots we can test more bugs in less time, otherwise we have to test less bugs in more time. so having said that, this bug persists even in 4.5.0.0.alpha0+ Build ID: 84a6d8eeaab540e5b2ea3baffd919903dff8c247 TinderBox: Win-x86@39, Branch:master, Time: 2014-11-22_23:41:04 moving this to mab4.3 list since 4.2.x is end if life -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||75137 -- You are receiving this mail because: You are on the CC list for the bug. 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 81056] docx export of ducks beaks MS Import ...
https://bugs.freedesktop.org/show_bug.cgi?id=81056 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it --- Comment #4 from tommy27 ba...@quipo.it --- please retest with 4.3.x and 4.4.x and tell if a new duck file created with newer LibO releases still freezes MS Office. unfortunately I hav no MS Word to test. if bug persists please move this report to mab4.3 list since 4.2.x is end of life -- 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 81056] docx export of ducks beaks MS Import ...
https://bugs.freedesktop.org/show_bug.cgi?id=81056 --- Comment #5 from tommy27 ba...@quipo.it --- moreover was this really a mab4.2? I see the version was set to 4.4 alpha... so maybe it's a mab4.4 please check -- 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 86867] Bidi error in inserted fields
https://bugs.freedesktop.org/show_bug.cgi?id=86867 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Attachment #110256|text/plain |application/vnd.oasis.opend mime type||ocument.text -- 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 86866] In Help, describe AutoCorrect Reset button
https://bugs.freedesktop.org/show_bug.cgi?id=86866 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||ba...@quipo.it Ever confirmed|0 |1 --- Comment #1 from tommy27 ba...@quipo.it --- actually the reset button deletes any of the new autocorrect entries you entered in the replacement table until you click ok. I mean, if you add a yellwo - yellow new replacement and you click NEW, then if you change your mind, instead of clicking OK (which stores the new autocorrect and exits the replacement table) you click on RESET which deletes the new entry but keeps the old one. so it doesn't resets the whole dataset to the factory default but just to the last saved version... and there's no confirmation dialog. regarding the documentation, it's true that that function is not documented. see link here: https://help.libreoffice.org/4.3/Common/Replace status NEW -- 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 86868] Arabic enteries don't appear in Text Box
https://bugs.freedesktop.org/show_bug.cgi?id=86868 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Version|4.5.0.0.alpha0+ Master |4.3.3.2 release -- 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 58845] no shortcut or toolbar button for Extension Manager
https://bugs.freedesktop.org/show_bug.cgi?id=58845 --- Comment #8 from Maxim Monastirsky momonas...@gmail.com --- (In reply to Maxim Monastirsky from comment #6) Currently I'm not aware of any way to add this to the customization dialog. Well, I meant in its current state. Of course we can create a new command that will internally call this service, and use that new command for the menu, instead of directly referencing the service. -- 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 86321] EDITING, FORMATTING: Graphic didnt automatic update when change variabele (recalculation not triggered)
https://bugs.freedesktop.org/show_bug.cgi?id=86321 --- Comment #11 from vlb v...@xs4all.nl --- (In reply to vlb from comment #6) Referring bug 86572 and do hard recalc CTRL+SHIFT+F9 than the graphic is oke. It didn't work always with hard recalc CTRL+SHIFT+F9, sometimes you must save the file and when you open the file again, the graphic/chart is oke. -- 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 81396] XLSX IMPORT: Data plots in chart not visible when cells have formula, needs Ctrl+Shift+F9 (Steps in Comment 5)
https://bugs.freedesktop.org/show_bug.cgi?id=81396 vlb v...@xs4all.nl changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=86321 -- 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 86321] EDITING, FORMATTING: Graphic didnt automatic update when change variabele (recalculation not triggered)
https://bugs.freedesktop.org/show_bug.cgi?id=86321 vlb v...@xs4all.nl changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=81396 -- 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 81396] XLSX IMPORT: Data plots in chart not visible when cells have formula, needs Ctrl+Shift+F9 (Steps in Comment 5)
https://bugs.freedesktop.org/show_bug.cgi?id=81396 vlb v...@xs4all.nl changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=86572 -- 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 86572] LO4.4.0.0.beta1 caculation formula result in 0
https://bugs.freedesktop.org/show_bug.cgi?id=86572 vlb v...@xs4all.nl changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=81396 -- 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 86866] In Help, describe AutoCorrect Options Replace Ok, Cancel, Reset buttons
https://bugs.freedesktop.org/show_bug.cgi?id=86866 tommy27 ba...@quipo.it changed: What|Removed |Added Blocks||80430 Summary|In Help, describe |In Help, describe |AutoCorrect Reset button|AutoCorrect Options Replace ||Ok, Cancel, Reset buttons --- Comment #2 from tommy27 ba...@quipo.it --- to be honest, also the OK and CANCEL buttons have no description in the help (and never had since LiO 3.3.0). so I'm editing summary notes, changing version field and adding this report to Bug 80430 - LOCALHELP: Features x Documentation gap meta issue basically the functions are: OK - stores changes and exits the replacement table CANCEL - discard recent changes and exits the replacement table RESET - discard recent changes but leaves the replacement table open for further edit -- 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 80430] LOCALHELP: Features x Documentation gap meta issue
https://bugs.freedesktop.org/show_bug.cgi?id=80430 --- Comment #19 from tommy27 ba...@quipo.it --- added Bug 86866 - In Help, describe AutoCorrect Options Replace Ok, Cancel, Reset buttons -- 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 80430] LOCALHELP: Features x Documentation gap meta issue
https://bugs.freedesktop.org/show_bug.cgi?id=80430 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||86866 -- 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 86866] In Help, describe AutoCorrect Options Replace Ok, Cancel, Reset buttons
https://bugs.freedesktop.org/show_bug.cgi?id=86866 tommy27 ba...@quipo.it changed: What|Removed |Added Version|4.3.4.1 release |3.3.0 release -- 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 86871] New: Abolish use of single ellipsis button labels in UI
https://bugs.freedesktop.org/show_bug.cgi?id=86871 Bug ID: 86871 Summary: Abolish use of single ellipsis button labels in UI Product: LibreOffice Version: unspecified Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: olivier.hal...@documentfoundation.org Several UI buttons are labeled with a single ellipsis (...). The use of such label in buttons is less than optimal, since it does not give to the user an idea of what action will be executed on clicking the button. Besides, the new Glade/UI files are suitable for widgets autosizing, and button size adjustement should not be a concern, which will help translators. My suggestion is to change the ellipsis into a more meaningfull label. For example Insert - Table of Contents - Index and Table of contents tab - Create from - Styles - ... This last ellipsis means actually Assign styles -- 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 86777] Mailmerge: Setting AskForMerge to false in main.xcd ha no effect :(
https://bugs.freedesktop.org/show_bug.cgi?id=86777 bugzil...@cb-computerservice.at changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID --- Comment #2 from bugzil...@cb-computerservice.at --- Huhhh, strangee... I was just about to answer Julien, now I can't reproduce the problem anymore. I was 100% sure, that I stopped all instances of LibO when I modified the main.xcd, (I have to do that modification on every single LibO Update, so I'm quite trained in it), but seems like after a restart of the machine, the problem is gone. I'll try to set the bug to works for me. Sorry for the inconvenience. -- 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 86860] Border thickness 1.50 reverts to 0.75 when saved/reopened.
https://bugs.freedesktop.org/show_bug.cgi?id=86860 --- Comment #2 from anthonyd...@msn.com --- I tried it, but I can't reproduce it. I'm also running 4.3.4.1 on OS X 10.10.1 -- 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 86779] Undo dragging a column crashes LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=86779 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 -- 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 86775] Crash Recovery crashes
https://bugs.freedesktop.org/show_bug.cgi?id=86775 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 -- 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 86859] MacOSX: Italic shown wrong for combining diacritics
https://bugs.freedesktop.org/show_bug.cgi?id=86859 anthonyd...@msn.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #2 from anthonyd...@msn.com --- I can confirm this bug. I reproduced it running version 4.3.4.1 on OS X 10.10.1 -- 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 86740] Improvement idea - separate the main programs
https://bugs.freedesktop.org/show_bug.cgi?id=86740 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Version: 4.5.0.0.alpha0+ Build ID: 1386c348f81738a9966d1217db89d1f603466317 Locale: fr_ Can not confirm on own master build osx 10.10.1 Tested printing a4 letter default page style portrait - printed in portrait mode as expected Two different printers : Samsung CLX 3170 and Kyocera FS C5150 -- 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 86740] Improvement idea - separate the main programs
https://bugs.freedesktop.org/show_bug.cgi?id=86740 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- (In reply to Alex Thurgood from comment #1) Version: 4.5.0.0.alpha0+ Build ID: 1386c348f81738a9966d1217db89d1f603466317 Locale: fr_ Can not confirm on own master build osx 10.10.1 Tested printing a4 letter default page style portrait - printed in portrait mode as expected Two different printers : Samsung CLX 3170 and Kyocera FS C5150 Please ignore previous comment - wrong bug report 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 86838] Portrait printing prints rotated 90 degrees
https://bugs.freedesktop.org/show_bug.cgi?id=86838 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Version: 4.5.0.0.alpha0+ Build ID: 1386c348f81738a9966d1217db89d1f603466317 Locale: fr_ Can not confirm on own master build osx 10.10.1 Tested printing a4 letter default page style portrait - printed in portrait mode as expected Two different printers : Samsung CLX 3170 and Kyocera FS C5150 -- 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 86740] Improvement idea - separate the main programs
https://bugs.freedesktop.org/show_bug.cgi?id=86740 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WONTFIX --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- This has been asked for before - it will probably never happen, all of the modules use the same basic instantiation, separating out the code would be very arduous, which is why they come in one single app bundle. You can in theory create separate launchers for each module anyway from the command line, or maybe with Applescript - this is an exercise left to the user. -- 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 86838] Portrait printing prints rotated 90 degrees
https://bugs.freedesktop.org/show_bug.cgi?id=86838 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- Please provide test document displaying issue. -- 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 86859] MacOSX: Italic shown wrong for combining diacritics
https://bugs.freedesktop.org/show_bug.cgi?id=86859 --- Comment #3 from anthonyd...@msn.com --- Created attachment 110261 -- https://bugs.freedesktop.org/attachment.cgi?id=110261action=edit Test of the italic 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 86872] New: auto complete enhancement
https://bugs.freedesktop.org/show_bug.cgi?id=86872 Bug ID: 86872 Summary: auto complete enhancement Product: LibreOffice Version: unspecified Hardware: Other OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: shantanu@gmail.com There is no way to save auto-complete list. Another limitation is that there is max limit of 10,000 words that auto-complete can handle. This limit should be increased and please provide an option to save auto complete list that can be reused in the next session. -- 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 86872] auto complete enhancement
https://bugs.freedesktop.org/show_bug.cgi?id=86872 shantanu shantanu@gmail.com changed: What|Removed |Added See Also||https://issues.apache.org/o ||oo/show_bug.cgi?id=121706 -- 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 86872] auto complete enhancement
https://bugs.freedesktop.org/show_bug.cgi?id=86872 shantanu shantanu@gmail.com changed: What|Removed |Added See Also||https://issues.apache.org/o ||oo/show_bug.cgi?id=81945 -- 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 59715] document as e-mail not working if app name includes spaces
https://bugs.freedesktop.org/show_bug.cgi?id=59715 --- Comment #8 from Alex Thurgood ipla...@yahoo.co.uk --- Confirming with LO 3.6, but setting to needinfo for reasons below. This was an old bug, and a known limitation of the detection code. LO 3.6 is ancient in project terms. Does it still occur with the latest production release of Libreoffice ? Please retest and report back. Bear in mind that bugs in end of life versions such as 3.6.x or even 4.2.x are not going to be fixed in those versions. -- 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 59715] document as e-mail not working if app name includes spaces
https://bugs.freedesktop.org/show_bug.cgi?id=59715 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 -- 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 86839] Failing unit test sw_ooxmlexport building master on OS X 10.10.1 / Xcode 6.1
https://bugs.freedesktop.org/show_bug.cgi?id=86839 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- I don't see any failure in my build output on master, current build 29/11/2014 -- 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 86859] MacOSX: Italic shown wrong for combining diacritics
https://bugs.freedesktop.org/show_bug.cgi?id=86859 --- Comment #4 from Urmas davian...@gmail.com --- Please attach the document itself too. -- 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
