[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/agenda/CGAgenda.py |3 +- wizards/com/sun/star/wizards/common/ConfigSet.py | 26 --- 2 files changed, 16 insertions(+), 13 deletions(-) New commits: commit 58b8c60758cea0249735d8208bd3cd55759722fb Author: Xisco Fauli Date: Tue Mar 12 20:58:37 2013 +0100 pywizards: make configset general Change-Id: Ia2d953166cac672fd9aa44e71d6486cb59df440e diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py b/wizards/com/sun/star/wizards/agenda/CGAgenda.py index 335f6ed..ee8435b 100644 --- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py +++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py @@ -17,6 +17,7 @@ # from ..common.ConfigGroup import ConfigGroup from ..common.ConfigSet import ConfigSet +from .CGTopic import CGTopic class CGAgenda(ConfigGroup): @@ -42,4 +43,4 @@ class CGAgenda(ConfigGroup): self.cp_TemplatePath = str() self.cp_ProceedMethod = int() -self.cp_Topics = ConfigSet() +self.cp_Topics = ConfigSet(CGTopic) diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index ee041de..79ae0e3 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -18,7 +18,6 @@ import traceback from .ConfigGroup import ConfigGroup from .Configuration import Configuration -from ..agenda.CGTopic import CGTopic class ConfigSet(ConfigGroup): ''' @@ -30,7 +29,8 @@ class ConfigSet(ConfigGroup): to avoid this "deletion" of nulls. ''' -def __init__(self): +def __init__(self, childType): +self.childType = childType self.childrenList = [] self.childrenListLen = 0 @@ -42,12 +42,13 @@ class ConfigSet(ConfigGroup): try: childView = configurationView.createInstance() configurationView.insertByName(index, childView) -topic = CGTopic() -topic.cp_Index = item[0].Value -topic.cp_Topic = item[1].Value -topic.cp_Responsible = item[2].Value -topic.cp_Time = item[3].Value -topic.writeConfiguration(childView, param) +if callable( self.childType ): +topic = self.childType() +topic.cp_Index = item[0].Value +topic.cp_Topic = item[1].Value +topic.cp_Responsible = item[2].Value +topic.cp_Time = item[3].Value +topic.writeConfiguration(childView, param) except Exception: traceback.print_exc() @@ -57,10 +58,11 @@ class ConfigSet(ConfigGroup): if names: for i in names: try: -topic = CGTopic() -topic.readConfiguration( -configurationView.getByName(i), param) -self.childrenList.append(topic) +if callable( self.childType ): +topic = self.childType() +topic.readConfiguration( +configurationView.getByName(i), param) +self.childrenList.append(topic) except Exception: traceback.print_exc() self.childrenListLen = len(self.childrenList) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6c/ecd60ceff2c5064bcca677514d06d6e410654d
6c/ecd60ceff2c5064bcca677514d06d6e410654d |1 + 1 file changed, 1 insertion(+) New commits: commit 8be31ac66aa00de13a8e6e8109682d938ebb0912 Author: Xisco Fauli Date: Wed Mar 13 01:23:36 2013 +0100 Notes added by 'git notes add' diff --git a/6c/ecd60ceff2c5064bcca677514d06d6e410654d b/6c/ecd60ceff2c5064bcca677514d06d6e410654d new file mode 100644 index 000..740fc90 --- /dev/null +++ b/6c/ecd60ceff2c5064bcca677514d06d6e410654d @@ -0,0 +1 @@ +merged as: 6ab3d3d906fe6d5a871d64ace6db32e13e664661 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 15/5cf194a0ecf18e3b19cf73d05485c59de640a2
15/5cf194a0ecf18e3b19cf73d05485c59de640a2 |1 + 1 file changed, 1 insertion(+) New commits: commit 5c578e96b70a2404560f95fe8e48022f07d98170 Author: Xisco Fauli Date: Wed Mar 13 20:08:51 2013 +0100 Notes added by 'git notes add' diff --git a/15/5cf194a0ecf18e3b19cf73d05485c59de640a2 b/15/5cf194a0ecf18e3b19cf73d05485c59de640a2 new file mode 100644 index 000..0511b79 --- /dev/null +++ b/15/5cf194a0ecf18e3b19cf73d05485c59de640a2 @@ -0,0 +1 @@ +merged as: b2603c7bc701e6f42480b59429563ad64d01b0a6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx | 56 --
1 file changed, 6 insertions(+), 50 deletions(-)
New commits:
commit 40a0e22203c4426a561a84422a1dd06024465974
Author: Xisco Fauli
Date: Wed Mar 13 20:12:16 2013 +0100
remove commented code
Change-Id: Ib62d4513e27791a848594925392a45ec9ff13983
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 9244b57..f81b215 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -226,18 +226,6 @@ void doTestCode()
// enable structure
aWriter.EndStructureElement();
-// add something to the long paragraph as an afterthought
-/* PDFWriter::aWriter.GetCurrentStructureElement removed as an
unusedcode.easy item:
-
http://cgit.freedesktop.org/libreoffice/core/commit/?id=09279fe3dad24ab58121e4f0a9564d252b64d81a
-
-sal_Int32 nSaveStruct = aWriter.GetCurrentStructureElement();
-aWriter.SetCurrentStructureElement( nLongPara );
-aWriter.DrawText( Rectangle( Point( 4500,4500 ), Size( 12000, 1000 ) ),
- String( RTL_CONSTASCII_USTRINGPARAM( "Add something to
the longish paragraph above." ) ),
- TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
-aWriter.SetCurrentStructureElement( nSaveStruct );
-*/
-
aWriter.EndStructureElement();
aWriter.EndStructureElement();
aWriter.BeginStructureElement( PDFWriter::Figure );
@@ -304,20 +292,6 @@ void doTestCode()
aWriter.SetFillColor( Color( COL_LIGHTRED ) );
aWriter.DrawRect( aTranspRect );
-/*
-EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap&
rAlphaMask ) is removed as an unusedcode.easy item:
-
http://cgit.freedesktop.org/libreoffice/core/commit/?id=581e7d7057afa87036d84e42c0e0a8a7368e20c7
-
-aWriter.BeginTransparencyGroup();
-aWriter.SetFillColor( Color( COL_LIGHTGREEN ) );
-aWriter.DrawEllipse( aTranspRect );
-aWriter.SetTextColor( Color( COL_LIGHTBLUE ) );
-aWriter.DrawText( aTranspRect,
- String( RTL_CONSTASCII_USTRINGPARAM( "Some transparent
text" ) ),
- TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER |
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
-aWriter.EndTransparencyGroup( aTranspRect, aTransMask );
-*/
-
Bitmap aImageBmp( Size( 256, 256 ), 24 );
pAcc = aImageBmp.AcquireWriteAccess();
pAcc->SetFillColor( Color( 0xff, 0, 0xff ) );
@@ -354,29 +328,6 @@ void doTestCode()
aWall.SetStyle( WALLPAPER_TILE );
aWriter.DrawWallpaper( Rectangle( Point( 4400, 4200 ), Size( 10200, 6300 )
), aWall );
-/*
-BeginPattern/EndPattern is removed as an unusedcode.easy item:
-
http://cgit.freedesktop.org/libreoffice/core/commit/?id=581e7d7057afa87036d84e42c0e0a8a7368e20c7
-
-aWriter.Push( PUSH_ALL );
-aWriter.BeginPattern(Rectangle(Point(0,0),Size(2000,1000)));
-aWriter.SetFillColor( Color( COL_RED ) );
-aWriter.SetLineColor( Color( COL_LIGHTBLUE ) );
-Point aFillPoints[] = { Point( 1000, 0 ),
-Point( 0, 1000 ),
-Point( 2000, 1000 ) };
-aWriter.DrawPolygon( Polygon( 3, aFillPoints ) );
-aWriter.DrawBitmap( Point( 200, 200 ), Size( 1600, 600 ), aTransMask );
-aWriter.DrawText( Rectangle( Point( 200, 200 ), Size( 1600, 600 ) ),
String( RTL_CONSTASCII_USTRINGPARAM( "Pattern" ) ) );
-sal_Int32 nPattern = aWriter.EndPattern( SvtGraphicFill::Transform() );
-aWriter.Pop();
-Rectangle aPolyRect( Point( 3800, 11200 ), Size( 10200, 6300 ) );
-aWriter.DrawPolyPolygon( PolyPolygon( Polygon( aPolyRect ) ), nPattern,
true );
-aWriter.SetFillColor();
-aWriter.SetLineColor( Color( COL_LIGHTBLUE ) );
-aWriter.DrawRect( aPolyRect );
-*/
-
aWriter.NewPage( 595, 842 );
aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
aWriter.SetFont( Font( String( "Times" ), Size( 0, 500 ) ) );
commit 58b6a6161e7edd10d33fdb67510e7d68440128f9
Author: Zhe Wang
Date: Fri Sep 7 04:33:47 2012 +
Fix issue #120627#: [From Symphony]the text on the Y axis is reversed when
export ppt file to PDF format.
* subversion/main/vcl/source/gdi/pdfwriter_impl.cxx
[]Change nXOffset value from the distance of axis Y between two points to
the distance between two points.
Patch by: Tang Meng
Suggested by: Wang Zhe
Found by: Tang Meng
Review by: Wang Zhe
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 636cd94..9244b57 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7514,7 +7514,12 @@ void PDFWriterImpl::drawVerticalGlyphs(
}
aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point(
(int)((double)nXOffset/fXScale), 0 ) ) - m_pReferenceDevice->PixelToLogic(
Point() ) );
if( i < rGlyphs.size()-1 )
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/3ae3e6bf2f20f7deb48ee80ce12d840ea35e07
96/3ae3e6bf2f20f7deb48ee80ce12d840ea35e07 |1 + 1 file changed, 1 insertion(+) New commits: commit 5437b7ce25eb56fd07a95e0d77434a7f7c9fe836 Author: Xisco Fauli Date: Mon Mar 25 00:10:31 2013 +0100 Notes added by 'git notes add' diff --git a/96/3ae3e6bf2f20f7deb48ee80ce12d840ea35e07 b/96/3ae3e6bf2f20f7deb48ee80ce12d840ea35e07 new file mode 100644 index 000..b9d699b --- /dev/null +++ b/96/3ae3e6bf2f20f7deb48ee80ce12d840ea35e07 @@ -0,0 +1 @@ +merged as: 6fd9ad9f3a61a3c489140100cad269c9edfee479 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f3/c156fd4e1d847606433b72cd4d198d90674603
f3/c156fd4e1d847606433b72cd4d198d90674603 |1 + 1 file changed, 1 insertion(+) New commits: commit c7574fdcf29965f933ca68d4e7853434cb0ac6a5 Author: Xisco Fauli Date: Mon Mar 25 00:48:14 2013 +0100 Notes added by 'git notes add' diff --git a/f3/c156fd4e1d847606433b72cd4d198d90674603 b/f3/c156fd4e1d847606433b72cd4d198d90674603 new file mode 100644 index 000..a5a7941 --- /dev/null +++ b/f3/c156fd4e1d847606433b72cd4d198d90674603 @@ -0,0 +1 @@ +merged as: 40ca6b3a9f805e4a1c12a9ed2c487282fff1c08b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b0/e67d12cb84c0b5272905cb8aee37bfce794fb1
b0/e67d12cb84c0b5272905cb8aee37bfce794fb1 |1 + 1 file changed, 1 insertion(+) New commits: commit 5cab7a6fcb97af93a1d68d71a3112867ae47ebe2 Author: Xisco Fauli Date: Mon Mar 25 00:50:52 2013 +0100 Notes added by 'git notes add' diff --git a/b0/e67d12cb84c0b5272905cb8aee37bfce794fb1 b/b0/e67d12cb84c0b5272905cb8aee37bfce794fb1 new file mode 100644 index 000..aab404b --- /dev/null +++ b/b0/e67d12cb84c0b5272905cb8aee37bfce794fb1 @@ -0,0 +1 @@ +merged as: 69b0688589fe611d873d2c8d2556dd1279c764a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - wizards/com wizards/Pyuno_commonwizards.mk
wizards/Pyuno_commonwizards.mk|1
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 26 -
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 47 +--
wizards/com/sun/star/wizards/agenda/CGAgenda.py | 45 +-
wizards/com/sun/star/wizards/agenda/CGTopic.py| 29 -
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 14
wizards/com/sun/star/wizards/common/ConfigGroup.py|8
wizards/com/sun/star/wizards/common/ConfigNode.py | 30 -
wizards/com/sun/star/wizards/common/ConfigSet.py | 151 --
wizards/com/sun/star/wizards/text/TextSectionHandler.py |2
10 files changed, 92 insertions(+), 261 deletions(-)
New commits:
commit 0e5f695a8e0e50889d74b266f96c88aabd590c65
Author: Xisco Fauli
Date: Sun Feb 3 00:41:45 2013 +0100
pyagenda: load the proper data for each topic
Change-Id: Ia7d8d65a868b86c81feb489328cbcb6bbd4f75f6
diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
index a50dbd9..335f6ed 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
@@ -17,7 +17,6 @@
#
from ..common.ConfigGroup import ConfigGroup
from ..common.ConfigSet import ConfigSet
-from .CGTopic import CGTopic
class CGAgenda(ConfigGroup):
@@ -43,4 +42,4 @@ class CGAgenda(ConfigGroup):
self.cp_TemplatePath = str()
self.cp_ProceedMethod = int()
-self.cp_Topics = ConfigSet(CGTopic())
+self.cp_Topics = ConfigSet()
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index ba7ea69..e69ed13 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -16,9 +16,9 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import traceback
-import inspect
from .ConfigGroup import ConfigGroup
from .Configuration import Configuration
+from ..agenda.CGTopic import CGTopic
class ConfigSet(ConfigGroup):
'''
@@ -30,13 +30,9 @@ class ConfigSet(ConfigGroup):
to avoid this "deletion" of nulls.
'''
-def __init__(self, topic):
-self.topic = topic
+def __init__(self):
self.childrenList = []
-def add(self, name, o):
-self.childrenList.append(o)
-
def writeConfiguration(self, configView, param):
names = self.childrenMap.keys()
if isinstance(self.childClass, ConfigNode):
@@ -68,8 +64,9 @@ class ConfigSet(ConfigGroup):
if names:
for i in names:
try:
-self.topic.readConfiguration(
+topic = CGTopic()
+topic.readConfiguration(
configurationView.getByName(i), param)
-self.add(i, self.topic)
+self.childrenList.append(topic)
except Exception:
traceback.print_exc()
commit ae4d40f3f0e13c3720667a6c6a143480d0136c52
Author: Xisco Fauli
Date: Sat Feb 2 22:49:18 2013 +0100
pyagenda: i have to redo this class so this method is unused now
Change-Id: Ief3461be5eeb6b952b76eeacf2778cb5beef6826
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index aa02c6a..ba7ea69 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -32,30 +32,7 @@ class ConfigSet(ConfigGroup):
def __init__(self, topic):
self.topic = topic
-self.childrenMap = {}
self.childrenList = []
-self.noNulls = False
-
-def add2(self, name, o):
-self.childrenMap[name] = o
-if isinstance(name, int):
-i = name
-self.childrenList.insert(i, o)
-else:
-try:
-i = o.cp_Index
-oldSize = self.getSize()
-if oldSize <= i:
-newSize = i - oldSize
-self.childrenList += [None] * newSize
-self.noNulls = True
-else:
-self.noNulls = False
-self.childrenList.insert(i, o);
-if oldSize > i:
-oldSize = i
-except Exception:
-self.childrenList.append(o)
def add(self, name, o):
self.childrenList.append(o)
commit acee06b28e2991cf4b3a8935b9a754902367fa1c
Author: Xisco Fauli
Date: Sat Feb 2 22:47:51 2013 +0100
pyagenda: remove ConfigNode from makefile
Change-Id: Icacd1addd9e43fb891b0d5cb3c20741380afbd51
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index 0391df1d..143b913 100644
--- a/wizards/Pyuno_commonwizards.mk
[Libreoffice-commits] core.git: 2 commits - wizards/com
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 292 ---
wizards/com/sun/star/wizards/fax/CallWizard.py |4
wizards/com/sun/star/wizards/ui/ControlScroller.py | 72 +---
3 files changed, 168 insertions(+), 200 deletions(-)
New commits:
commit 8b346fe023b1bc9b85155dfe00a73042945c6067
Author: Xisco Fauli
Date: Sun Feb 3 21:42:06 2013 +0100
pyagenda: use local variables
Change-Id: Ie308e7c01103def987272f1df6c691d25ce4a6a8
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index b8a11e0..e06e13b 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -89,7 +89,6 @@ class TopicsControl(ControlScroller):
TOPIC = "txtTopicTopic_"
RESP = "cbTopicResp_"
TIME = "txtTopicTime_"
-nscrollvalue = 0
LABEL_PROPS = (PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL,
PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX,
@@ -98,8 +97,6 @@ class TopicsControl(ControlScroller):
PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH)
-lastFocusRow = 0
-lastFocusControl = None
def __init__(self, dialog, xmsf, agenda):
try:
@@ -107,6 +104,9 @@ class TopicsControl(ControlScroller):
dialog, xmsf, 5, 92, 38, 212, 5, 18, HID + 32)
self.dialog = dialog
self.initializeScrollFields(agenda)
+self.nscrollvalue = 0
+self.lastFocusRow = 0
+self.lastFocusControl = None
# set some focus listeners for TAB scroll down and up...
# prepare scroll down on tab press...
self.lastTime = \
@@ -144,34 +144,32 @@ class TopicsControl(ControlScroller):
end, which enables the user to enter data...
'''
-@classmethod
def insertRowAtEnd(self):
-l = len(ControlScroller.scrollfields)
+l = len(self.scrollfields)
self.registerControlGroup(self.newRow(l), l)
self.setTotalFieldCount(l + 1)
# if the new row is visible, it must have been disabled
# so it should be now enabled...
-if l - ControlScroller.nscrollvalue < self.nblockincrement:
-self.ControlGroupVector[l - ControlScroller.nscrollvalue].\
+if l - self.nscrollvalue < self.nblockincrement:
+self.ControlGroupVector[l - self.nscrollvalue].\
setEnabled(True)
'''
remove the last row
'''
-@classmethod
def removeLastRow(self):
-l = len(ControlScroller.scrollfields)
+l = len(self.scrollfields)
# if we should scroll up...
-if (l - ControlScroller.nscrollvalue) >= 1 \
-and (l - ControlScroller.nscrollvalue) <= self.nblockincrement
\
-and ControlScroller.nscrollvalue > 0:
-while (l - ControlScroller.nscrollvalue >= 1) \
-and l - ControlScroller.nscrollvalue <=
self.nblockincrement \
-and ControlScroller.nscrollvalue > 0:
-self.setScrollValue(ControlScroller.nscrollvalue - 1)
+if (l - self.nscrollvalue) >= 1 \
+and (l - self.nscrollvalue) <= self.nblockincrement \
+and self.nscrollvalue > 0:
+while (l - self.nscrollvalue >= 1) \
+and l - self.nscrollvalue <= self.nblockincrement \
+and self.nscrollvalue > 0:
+self.setScrollValue(self.nscrollvalue - 1)
# if we should disable a row...
-elif ControlScroller.nscrollvalue == 0 and l - 1 <
self.nblockincrement:
+elif self.nscrollvalue == 0 and l - 1 < self.nblockincrement:
self.ControlGroupVector[l - 1].setEnabled(False)
self.unregisterControlGroup(l - 1)
@@ -184,7 +182,6 @@ class TopicsControl(ControlScroller):
@param fe
'''
-@classmethod
def focusGained(self, fe):
xc = fe.Source
self.focusGained2(xc)
@@ -199,14 +196,13 @@ class TopicsControl(ControlScroller):
@param control
'''
-@classmethod
def focusGained2(self, control):
try:
#calculate in which row we are...
name = control.Model.Name
num = name[name.index("_") + 1:]
-TopicsControl.lastFocusRow = int(num) +
ControlScroller.nscrollvalue
-TopicsControl.lastFocusControl = control
+self.lastFocusRow = int(num) + self.nscrollvalue
+self.lastFocusControl = control
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/fax/CallWizard.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b60af08691215c8603d80f33434cab4dfc1d9e3d
Author: Xisco Fauli
Date: Sun Feb 3 21:47:46 2013 +0100
upps, I shouldn't have committed it
Change-Id: Id5b17c0fbad9e16277a892b1b89e109ea420c41c
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py
b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 9c0205a..b779885 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -18,7 +18,7 @@
import unohelper
import traceback
-from ..agenda.AgendaWizardDialogImpl import AgendaWizardDialogImpl
+from .FaxWizardDialogImpl import FaxWizardDialogImpl
from com.sun.star.task import XJobExecutor
@@ -31,7 +31,7 @@ class CallWizard(unohelper.Base, XJobExecutor):
def trigger(self, args):
try:
-fw = AgendaWizardDialogImpl(self.ctx.ServiceManager)
+fw = FaxWizardDialogImpl(self.ctx.ServiceManager)
fw.startWizard(self.ctx.ServiceManager)
except Exception as e:
print ("Wizard failure exception " + str(type(e)) +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - wizards/com
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 39 +++
wizards/com/sun/star/wizards/ui/ControlScroller.py | 32 ---
wizards/com/sun/star/wizards/ui/UnoDialog.py |4 -
3 files changed, 33 insertions(+), 42 deletions(-)
New commits:
commit 949facecdc0a1aed8f16c4c1e67e94e2e7f0c2e9
Author: Xisco Fauli
Date: Tue Feb 5 22:54:33 2013 +0100
pyagenda: Update topics's gui when launching the wizard
Change-Id: Ifb38b49fb62d5fc85bcc6dfa7729bb87d3c7f8e0
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index f25fb4d..f579838 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -103,7 +103,10 @@ class TopicsControl(ControlScroller):
super(TopicsControl, self).__init__(
dialog, xmsf, 5, 92, 38, 212, 5, 18, HID + 32)
self.dialog = dialog
+#fill preview's table
self.initializeScrollFields(agenda)
+#fill gui's table
+self.fillupControls(True)
self.nscrollvalue = 0
self.lastFocusRow = 0
self.lastFocusControl = None
@@ -314,9 +317,6 @@ class TopicsControl(ControlScroller):
Implementation of ControlScroller
This is a UI method which inserts a new row to the control.
It uses the child-class ControlRow. (see below).
-@param _index
-@param npos
-@see ControlRow
'''
def insertControlGroup(self, _index, npos):
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.py
b/wizards/com/sun/star/wizards/ui/ControlScroller.py
index 8afaff9..2f6d4a4 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.py
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.py
@@ -33,6 +33,7 @@ class ControlScroller(object):
_iCompWidth, _nblockincrement, _nlinedistance, _firsthelpindex):
self.xMSF = _xMSF
self.scrollfields = []
+self.ControlGroupVector = []
ControlScroller.nblockincrement = _nblockincrement
self.CurUnoDialog = _CurUnoDialog
self.iStep = _iStep
@@ -50,7 +51,7 @@ class ControlScroller(object):
self.sincSuffix = Desktop.getIncrementSuffix(
self.CurUnoDialog.xDialogModel, "imgBackground")
-ControlScroller.xScrollBar = self.CurUnoDialog.insertScrollBar(
+self.xScrollBar = self.CurUnoDialog.insertScrollBar(
"TitleScrollBar" + self.sincSuffix,
("Border", PropertyNames.PROPERTY_ENABLED,
PropertyNames.PROPERTY_HEIGHT,
@@ -65,13 +66,12 @@ class ControlScroller(object):
ControlScroller.iScrollBarWidth - 1,
self.iCompPosY + 1, self.iStep,
ControlScroller.iScrollBarWidth), 0, self)
-ControlScroller.nscrollvalue = 0
-ControlScroller.ControlGroupVector = []
+self.nscrollvalue = 0
ypos = self.iStartPosY + ControlScroller.SORELFIRSTPOSY
for i in range(ControlScroller.nblockincrement):
self.insertControlGroup(i, ypos)
ypos += self.linedistance
-
+
def fillupControls(self, binitialize):
for i in range(ControlScroller.nblockincrement):
if i < self.ncurfieldcount:
@@ -79,21 +79,23 @@ class ControlScroller(object):
if binitialize:
self.CurUnoDialog.repaintDialogStep()
+
def fillupControl(self, guiRow):
nameProps = self.scrollfields[guiRow]
-valueProps = self.scrollfields[guiRow + ControlScroller.nscrollvalue]
+valueProps = self.scrollfields[guiRow + self.nscrollvalue]
for index, item in enumerate(nameProps):
if self.CurUnoDialog.xDialogModel.hasByName(item.Name):
self.setControlData(item.Name, valueProps[index].Value)
else:
raise AttributeError("No such control !")
+self.ControlGroupVector[guiRow].setEnabled(True)
def setScrollValue(self, _nscrollvalue, _ntotfieldcount=None):
if _ntotfieldcount is not None:
self.setTotalFieldCount(_ntotfieldcount)
if _nscrollvalue >= 0:
-ControlScroller.xScrollBar.Model.ScrollValue = _nscrollvalue
+self.xScrollBar.Model.ScrollValue = _nscrollvalue
self.scrollControls()
def setCurFieldCount(self):
@@ -106,11 +108,11 @@ class ControlScroller(object):
self.ntotfieldcount = _ntotfieldcount
self.setCurFieldCount()
if self.ntotfieldcount > ControlScroller.nblockincrement:
-ControlScroller.xScrollBar.Model.Enabled = True
-ControlScroller.xScrollBar.Model.ScrollValueMax = \
+self.xScrollBar.Model.Enabled = True
+self.xScrollBar.Model.ScrollValueMax = \
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 13 +-- wizards/com/sun/star/wizards/agenda/TopicsControl.py | 24 +++-- wizards/com/sun/star/wizards/common/ConfigSet.py | 42 -- 3 files changed, 38 insertions(+), 41 deletions(-) New commits: commit 195007a80725d14c5dac64e2c9d1ed21e58da380 Author: Xisco Fauli Date: Fri Feb 8 19:04:00 2013 +0100 pyagenda: Save configuration after finishing the wizard Change-Id: Ia0d80ac089608178e714735d6bfc4516030ee5b9 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index 1cf8489..2c3e288 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py @@ -208,12 +208,6 @@ class AgendaWizardDialogImpl(AgendaWizardDialog): self.agenda, "cp_ProceedMethod", (self.optCreateAgenda, self.optMakeChanges), True).updateUI() -def saveConfiguration(self): -root = Configuration.getConfigurationRoot( -self.xMSF, "/org.openoffice.Office.Writer/Wizards/Agenda", True) -self.agenda.writeConfiguration(root, "cp_") -root.commitChanges() - def insertRoadmap(self): self.addRoadmap() @@ -360,7 +354,12 @@ class AgendaWizardDialogImpl(AgendaWizardDialog): "writer8_template") if bSaveSuccess: -self.saveConfiguration() +self.topicsControl.saveTopics(self.agenda) +root = Configuration.getConfigurationRoot( +self.xMSF, "/org.openoffice.Office.Writer/Wizards/Agenda", +True) +self.agenda.writeConfiguration(root, "cp_") +root.commitChanges() self.agendaTemplate.finish(self.topicsControl.scrollfields) diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py b/wizards/com/sun/star/wizards/agenda/TopicsControl.py index f579838..2fc619a 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py @@ -131,12 +131,12 @@ class TopicsControl(ControlScroller): def initializeScrollFields(self, agenda): # create a row for each topic with the given values -for i in range(len(agenda.cp_Topics.childrenList)): -row = self.newRow(i) -agenda.cp_Topics.childrenList[i].setDataToRow(row) +for index,item in enumerate(agenda.cp_Topics.childrenList): +row = self.newRow(index) +item.setDataToRow(row) # a parent class method -self.registerControlGroup(row, i) -self.updateDocumentRow(i) +self.registerControlGroup(row, index) +self.updateDocumentRow(index) # inserts a blank row at the end... self.insertRowAtEnd() @@ -157,6 +157,10 @@ class TopicsControl(ControlScroller): self.ControlGroupVector[l - self.nscrollvalue].\ setEnabled(True) +def saveTopics(self, agenda): +#last row is always empty +agenda.cp_Topics.childrenList = self.scrollfields[:-1] + ''' remove the last row ''' @@ -338,7 +342,7 @@ class TopicsControl(ControlScroller): def isRowEmpty(self, row): data = self.getTopicData(row) # now - is this row empty? -return data[1].Value or data[2].Value or data[3].Value +return not data[1].Value and not data[2].Value and not data[3].Value ''' update the preview document and @@ -355,7 +359,7 @@ class TopicsControl(ControlScroller): return self.updateDocumentCell( guiRow + self.nscrollvalue, column, data) -if not self.isRowEmpty(guiRow + self.nscrollvalue): +if self.isRowEmpty(guiRow + self.nscrollvalue): ''' if this is the row before the last one (the last row is always empty) @@ -370,7 +374,7 @@ class TopicsControl(ControlScroller): because the last one is always empty... ''' while len(self.scrollfields) > 1 \ -and not self.isRowEmpty( +and self.isRowEmpty( len(self.scrollfields) - 2): self.removeLastRow() cr = self.ControlGroupVector[ @@ -593,8 +597,8 @@ class TopicsControl(ControlScroller): elif (row1 + self.nscrollvalue) + \ (row2 + self.nscrollvalue) \ == (len(self.scrollfields) * 2 - 5): -if not self.isRowEmpty(len(self.scrollfields) - 2) \ -
[Libreoffice-commits] core.git: 3 commits - wizards/com
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 93 +++--- 1 file changed, 38 insertions(+), 55 deletions(-) New commits: commit efa0451d8eab878812e2bbacc4319d7490d0f333 Author: Xisco Fauli Date: Sun Feb 10 22:14:45 2013 +0100 pyagenda: remove placeholder when text is not empty Change-Id: I06ae1815ec1bd904e944929f1b50a0ee95a6a5ae diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index c993d62..07b3f35 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -662,7 +662,6 @@ class ItemsTable(object): # should this section be visible? visible = False # write items -# === cellName = "" ''' now go through all items that belong to this @@ -689,8 +688,6 @@ class ItemsTable(object): if not visible: return ''' -remove obsolete rows - if the cell that was last written is the current cell, it means this is the end of the table, so we end here. (because after getting the cellName above, @@ -889,6 +886,7 @@ class PlaceholderTextElement(TextElement): self.text = placeHolderText_ self.hint = hint_ self.xmsf = xmsf_ +self.xTextContentList = [] def write(self, textRange): textRange.String = self.placeHolderText @@ -896,11 +894,16 @@ class PlaceholderTextElement(TextElement): try: xTextContent = AgendaDocument.createPlaceHolder( self.xmsf, self.text, self.hint) +self.xTextContentList.append(xTextContent) textRange.Text.insertTextContent( textRange.Start, xTextContent, True) except Exception: traceback.print_exc() - +else: +if self.xTextContentList: +for i in self.xTextContentList: +textRange.Text.removeTextContent(i) +self.xTextContentList = [] ''' An Agenda element which writes no text, but inserts a placeholder, and formats it using a ParaStyleName. commit 2f7bd777d9724ff3b6c7697bf7c02d32eb661214 Author: Xisco Fauli Date: Sun Feb 10 21:15:19 2013 +0100 pyagenda: This shouldn't be commented Change-Id: I95dde2a3673f3304969329623af7f615b7388654 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index eb57f97..c993d62 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -872,9 +872,9 @@ class Topics(object): tableRows = Topics.table.Rows targetNumOfRows = topics * Topics.rowsPerTopic + 1 -'''if tableRows.Count > targetNumOfRows: +if tableRows.Count > targetNumOfRows: tableRows.removeByIndex( -targetNumOfRows, tableRows.Count - targetNumOfRows)''' +targetNumOfRows, tableRows.Count - targetNumOfRows) ''' A Text element which, if the text to write is empty (null or "") commit b4743abd03fb584cfc05361dff1b93eae4cf9867 Author: Xisco Fauli Date: Sun Feb 10 18:26:04 2013 +0100 pyagenda: use local variables Change-Id: I9fe8eae42c942823df3d200ebb0a0ae1c478d29a diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index 25ecf04..eb57f97 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -280,13 +280,10 @@ class AgendaDocument(TextDocument): Get the default locale of the document, and create the date and time formatters. ''' -AgendaDocument.dateUtils = self.DateUtils( -self.xMSF, self.xTextDocument) -AgendaDocument.formatter = AgendaDocument.dateUtils.formatter -AgendaDocument.dateFormat = \ -AgendaDocument.dateUtils.getFormat(DATE_SYSTEM_LONG) -AgendaDocument.timeFormat = \ -AgendaDocument.dateUtils.getFormat(TIME_HHMM) +self.dateUtils = self.DateUtils(self.xMSF, self.xTextDocument) +self.formatter = self.dateUtils.formatter +self.dateFormat = self.dateUtils.getFormat(DATE_SYSTEM_LONG) +self.timeFormat = self.dateUtils.getFormat(TIME_HHMM) self.initItemsCache() self.allItems = self.searchFillInItems(0) @@ -306,29 +303,25 @@ class AgendaDocument(TextDocument): for i in self.allItems: text = i.String.lstrip().lower() if text == self.templateConsts.FILLIN_TITLE: -
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 18 -
wizards/com/sun/star/wizards/common/FileAccess.py | 120 --
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 19 -
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 16 -
wizards/com/sun/star/wizards/text/TextDocument.py |2
wizards/com/sun/star/wizards/ui/WizardDialog.py | 11
6 files changed, 19 insertions(+), 167 deletions(-)
New commits:
commit 57041602e2e0c5d1035359108ff1237a324c39d6
Author: Xisco Fauli
Date: Mon Feb 11 22:01:25 2013 +0100
pywizards: simplify paths handling
Change-Id: I436ca81e180d595e018811823e8b77c8b675bef5
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 2c3e288..72f3b75 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -81,7 +81,8 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
self.agenda.readConfiguration(root, "cp_")
self.templateConsts = TemplateConsts
-
+
+self.initializePaths()
# initialize the agenda template
self.agendaTemplate = AgendaDocument(
self.xMSF, self.agenda, self.resources,
@@ -103,7 +104,6 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
self.topicsControl = TopicsControl(self, self.xMSF, self.agenda)
-self.initializePaths()
#special Control for setting the save Path:
self.insertPathSelectionControl()
@@ -143,15 +143,6 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
self.myPathSelection.sDefaultFilter = "writer8_template"
self.myPathSelection.addSelectionListener(self)
-def initializePaths(self):
-try:
-self.sTemplatePath = FileAccess.getOfficePath2(
-self.xMSF, "Template", "share", "/wizard")
-self.sUserTemplatePath = FileAccess.getOfficePath2(
-self.xMSF, "Template", "user", "")
-except NoValidPathException:
-traceback.print_exc()
-
'''
bind controls to the agenda member (DataAware model)
'''
@@ -227,10 +218,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
def initializeTemplates(self):
try:
-self.sTemplatePath = FileAccess.getOfficePath2(
-self.xMSF, "Template", "share", "/wizard")
-sAgendaPath = FileAccess.combinePaths(
-self.xMSF, self.sTemplatePath, "/wizard/agenda")
+sAgendaPath = self.sTemplatePath + "/wizard/agenda"
self.agendaTemplates = FileAccess.getFolderTitles(
self.xMSF, "aw", sAgendaPath)
return True
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py
b/wizards/com/sun/star/wizards/common/FileAccess.py
index fd7a97c..409c15c 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -16,10 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import traceback
-from .NoValidPathException import NoValidPathException
-
-from com.sun.star.ucb import CommandAbortedException
-from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO
'''
This class delivers static convenience methods
@@ -41,109 +37,6 @@ class FileAccess(object):
"com.sun.star.ucb.FileContentProvider")
@classmethod
-def deleteLastSlashfromUrl(self, _sPath):
-if _sPath.endswith("/"):
-return _sPath[:-1]
-else:
-return _sPath
-
-'''
-Further information on arguments value see in OO Developer Guide,
-chapter 6.2.7
-@param xMSF
-@param sPath
-@param xSimpleFileAccess
-@return the respective path of the office application.
-A probable following "/" at the end is trimmed.
-'''
-
-@classmethod
-def getOfficePath(self, xMSF, sPath, xSimpleFileAccess):
-try:
-ResultPath = ""
-xInterface = xMSF.createInstance("com.sun.star.util.PathSettings")
-ResultPath = str(Helper.getUnoPropertyValue(xInterface, sPath))
-ResultPath = self.deleteLastSlashfromUrl(ResultPath)
-return ResultPath
-except Exception:
-traceback.print_exc()
-return ""
-
-'''
-Further information on arguments value see in OO Developer Guide,
-chapter 6.2.7
-@param xMSF
-@param sPath
-@param sType use "
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/FileAccess.py |2 ++
1 file changed, 2 insertions(+)
New commits:
commit bbe6f3f59b72cbb3917f43265c59d084bab7cf6a
Author: Xisco Fauli
Date: Mon Feb 11 22:08:54 2013 +0100
ups, don't delete this
Change-Id: I7a1ce167fcd388bc31a3f746ebaefd44949b5fb1
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py
b/wizards/com/sun/star/wizards/common/FileAccess.py
index 409c15c..c695767 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -130,6 +130,8 @@ class FileAccess(object):
@classmethod
def getParentDir(self, url):
+while url[-1] == "/":
+url = url[:-1]
return url[:url.rfind("/")]
@classmethod
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/Pyuno_agenda.mk
wizards/Pyuno_agenda.mk | 45 + 1 file changed, 45 insertions(+) New commits: commit 2b9394f0c009b385756a0c5d75e3c1cd412f7236 Author: Xisco Fauli Date: Thu Feb 14 00:57:02 2013 +0100 pyagenda: forgot this file Change-Id: I7542a7c9ac3ab9d48251f0f5d39dbec17b5c475c diff --git a/wizards/Pyuno_agenda.mk b/wizards/Pyuno_agenda.mk new file mode 100644 index 000..f844303 --- /dev/null +++ b/wizards/Pyuno_agenda.mk @@ -0,0 +1,45 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Pyuno_Pyuno,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda)) + +$(eval $(call gb_Pyuno_add_files,agenda,\ +AgendaDocument.py \ +AgendaWizardDialogConst.py \ +AgendaWizardDialogImpl.py \ +AgendaWizardDialog.py \ +AgendaWizardDialogResources.py \ +CallWizard.py \ +CGAgenda.py \ +CGTopic.py \ +__init__.py \ +TemplateConsts.py \ +TopicsControl.py \ +)) +$(eval $(call gb_Pyuno_set_componentfile_full,agenda,wizards/com/sun/star/wizards/agenda/agenda,vnd.openoffice.pymodule:wizards.agenda,.CallWizard)) + +# vim:set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/DebugHelper.py | 27 -
wizards/com/sun/star/wizards/common/PropertySetHelper.py | 258 ---
2 files changed, 285 deletions(-)
New commits:
commit 752979511ef391e53a4ab04939e2500de41062fc
Author: Xisco Fauli
Date: Fri Feb 15 15:37:48 2013 +0100
pywizards: remove unused files
Change-Id: Ibbb45626c984f79f94a7e281b05bf86a25897b0c
diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.py
b/wizards/com/sun/star/wizards/common/DebugHelper.py
deleted file mode 100644
index b0dba77..000
--- a/wizards/com/sun/star/wizards/common/DebugHelper.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-class DebugHelper(object):
-
-@classmethod
-def exception(self, ex):
-raise NotImplementedError
-
-@classmethod
-def writeInfo(self, msg):
-raise NotImplementedError
-
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
deleted file mode 100644
index 3736972..000
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
+++ /dev/null
@@ -1,258 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-from .DebugHelper import DebugHelper
-
-class PropertySetHelper(object):
-
-@classmethod
-def __init__(self, _aObj):
-self.m_xPropertySet = _aObj
-self.m_aHashMap = {}
-
-'''
-set a property, don't throw any exceptions,
-they will only write down as a hint in the helper debug output
-@param _sName name of the property to set
-@param _aValue property value as object
-'''
-
-def setPropertyValueDontThrow(self, _sName, _aValue):
-try:
-setPropertyValue(_sName, _aValue)
-except Exception, e:
-DebugHelper.writeInfo(
-"Don't throw the exception with property name(" \
-+ _sName + " ) : " + e.getMessage())
-
-'''
-set a property,
-@param _sName name of the property to set
-@param _aValue property value as object
-@throws java.lang.Exception
-'''
-
-def setPropertyValue(self, _sName, _aValue):
-if self.m_xPropertySet is not None:
-try:
-self.m_xPropertySet.setPropertyValue(_sName, _aValue)
-except com.sun.star.beans.UnknownPropertyException, e:
-DebugHelper.writeInfo(e.getMessage())
-DebugHelper.exception(e)
-except com.sun.star.beans.PropertyVetoException, e:
-DebugHelper.writeInfo(e.getMessage())
-DebugHelper.exception(e)
-except ValueError, e:
-DebugHelper.writeInfo(e.getMessage())
-DebugHelper.exception(e)
-except com.sun.star.lang.WrappedTargetException, e:
-DebugHelper.writeInfo(e.getMessage())
-DebugHelper.exception(e)
-
-else:
-self.m_aHashMap[_sName] = _aValue
-
-'''
-get a property and convert it to a int value
-@param _sName the string name of the property
-@param _nDefault if an error occur, return this value
-@return the int value of the property
-'''
-
-def getPropertyValueAsInteger(self, _sName, _nDefault):
-aObject = None
-nValu
[Libreoffice-commits] core.git: wizards/Pyuno_commonwizards.mk
wizards/Pyuno_commonwizards.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit 81ee2a2fff822cd534507b867ebe3d0666a31ae0 Author: Xisco Fauli Date: Fri Feb 15 15:42:23 2013 +0100 pywizards: update makefile Change-Id: Ib9855286c68b873f60db7afefecc9c2f4364c53e diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk index 143b913..f213bb1 100644 --- a/wizards/Pyuno_commonwizards.mk +++ b/wizards/Pyuno_commonwizards.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Pyuno_add_files,wizards,\ common/FileAccess.py \ common/Properties.py \ common/Resource.py \ -common/DebugHelper.py \ common/NoValidPathException.py \ common/PropertyNames.py \ common/SystemDialog.py \ @@ -43,7 +42,6 @@ $(eval $(call gb_Pyuno_add_files,wizards,\ common/Desktop.py \ common/HelpIds.py \ common/NumberFormatter.py \ -common/PropertySetHelper.py \ text/TextElement.py \ document/__init__.py \ document/OfficeDocument.py \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit cc7f6a58c7d8d1cd3d2534b307dbf05b98561752 Author: Xisco Fauli Date: Fri Feb 15 20:19:16 2013 +0100 fdo#38451: Disable Sender and Recipient step Change-Id: I5ab0989ed4e5e30b97170cbba0d516eff4befc59 diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py index f3b55fe..8cf7c59 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py @@ -288,10 +288,11 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.xDialogModel.lstPrivateStyle.Enabled = False self.lstPrivOfficialStyleItemChanged() self.disableBusinessPaper() -self.enableSenderReceiver() +self.disableSenderReceiver() self.setPossibleFooter(True) if self.myPathSelection.xSaveTextBox.Text.lower(): self.myPathSelection.initializePath() +self.myLetterDoc.fillSenderWithUserData() def optPrivateLetterItemChanged(self): self.lstBusinessStylePos = None ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/examples
scripting/examples/python/HelloWorld.py |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 270967f340670189e42939d9432e28e8259feefc Author: Xisco Fauli Date: Sun Feb 17 14:59:45 2013 +0100 fdo#60670: Create a new document in case there's none Change-Id: I7e03481beb1d4e60601fd93d787bc7354495e41f diff --git a/scripting/examples/python/HelloWorld.py b/scripting/examples/python/HelloWorld.py index 48e7786..4cad8a8 100644 --- a/scripting/examples/python/HelloWorld.py +++ b/scripting/examples/python/HelloWorld.py @@ -21,7 +21,12 @@ def HelloWorldPython( ): """Prints the string 'Hello World(in Python)' into the current document""" #get the doc from the scripting context which is made available to all scripts -model = XSCRIPTCONTEXT.getDocument() +desktop = XSCRIPTCONTEXT.getDesktop() +model = desktop.getCurrentComponent() +#check whether there's already an opened document. Otherwise, create a new one +if not hasattr(model, "Text"): +model = desktop.loadComponentFromURL( +"private:factory/swriter","_blank", 0, () ) #get the XText interface text = model.Text #create an XTextRange at the end of the document ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - scripting/examples wizards/com
scripting/examples/python/HelloWorld.py |7 ++- wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 3e8af168ca227529b752abb9c7aecc42be4a2290 Author: Xisco Fauli Date: Fri Feb 15 20:19:16 2013 +0100 fdo#38451: Disable Sender and Recipient step Change-Id: I5ab0989ed4e5e30b97170cbba0d516eff4befc59 diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py index 466cd61..23d2f77 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py @@ -287,10 +287,11 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.xDialogModel.lstPrivateStyle.Enabled = False self.lstPrivOfficialStyleItemChanged() self.disableBusinessPaper() -self.enableSenderReceiver() +self.disableSenderReceiver() self.setPossibleFooter(True) if self.myPathSelection.xSaveTextBox.Text.lower(): self.myPathSelection.initializePath() +self.myLetterDoc.fillSenderWithUserData() def optPrivateLetterItemChanged(self): self.lstBusinessStylePos = None commit 70b6d7510d6910e046342114a79321ae8654764a Author: Xisco Fauli Date: Sun Feb 17 14:59:45 2013 +0100 fdo#60670: Create a new document in case there's none Change-Id: I7e03481beb1d4e60601fd93d787bc7354495e41f diff --git a/scripting/examples/python/HelloWorld.py b/scripting/examples/python/HelloWorld.py index 48e7786..4cad8a8 100644 --- a/scripting/examples/python/HelloWorld.py +++ b/scripting/examples/python/HelloWorld.py @@ -21,7 +21,12 @@ def HelloWorldPython( ): """Prints the string 'Hello World(in Python)' into the current document""" #get the doc from the scripting context which is made available to all scripts -model = XSCRIPTCONTEXT.getDocument() +desktop = XSCRIPTCONTEXT.getDesktop() +model = desktop.getCurrentComponent() +#check whether there's already an opened document. Otherwise, create a new one +if not hasattr(model, "Text"): +model = desktop.loadComponentFromURL( +"private:factory/swriter","_blank", 0, () ) #get the XText interface text = model.Text #create an XTextRange at the end of the document ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/984ade8bac7d8cb37ce569e373f29fd5fdbc7f
cb/984ade8bac7d8cb37ce569e373f29fd5fdbc7f |1 + 1 file changed, 1 insertion(+) New commits: commit 2937541b1b04169c7ad2a2b8ebd8109d17702d08 Author: Xisco Fauli Date: Tue Mar 26 01:05:31 2013 +0100 Notes added by 'git notes add' diff --git a/cb/984ade8bac7d8cb37ce569e373f29fd5fdbc7f b/cb/984ade8bac7d8cb37ce569e373f29fd5fdbc7f new file mode 100644 index 000..7e8383d --- /dev/null +++ b/cb/984ade8bac7d8cb37ce569e373f29fd5fdbc7f @@ -0,0 +1 @@ +merged as: 5278c7770a350771a96780c0e0d7a0bdae0d55b9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a6/134e2a15495fb899436b0ea4f1dbea2df64686
a6/134e2a15495fb899436b0ea4f1dbea2df64686 |1 + 1 file changed, 1 insertion(+) New commits: commit f71c51807fae157dda190200560ffe51bdde700e Author: Xisco Fauli Date: Tue Mar 26 01:00:50 2013 +0100 Notes added by 'git notes add' diff --git a/a6/134e2a15495fb899436b0ea4f1dbea2df64686 b/a6/134e2a15495fb899436b0ea4f1dbea2df64686 new file mode 100644 index 000..20d1320 --- /dev/null +++ b/a6/134e2a15495fb899436b0ea4f1dbea2df64686 @@ -0,0 +1 @@ +merged as: cf4260b85213b263f78c51d33557176c813989ef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/0d8ff36d5a39db8aa67ad05877452e30e14f0b
16/0d8ff36d5a39db8aa67ad05877452e30e14f0b |1 + 1 file changed, 1 insertion(+) New commits: commit 996bec5e7dc411735657e122234fec3dcec20774 Author: Xisco Fauli Date: Tue Mar 26 01:02:57 2013 +0100 Notes added by 'git notes add' diff --git a/16/0d8ff36d5a39db8aa67ad05877452e30e14f0b b/16/0d8ff36d5a39db8aa67ad05877452e30e14f0b new file mode 100644 index 000..48101a4 --- /dev/null +++ b/16/0d8ff36d5a39db8aa67ad05877452e30e14f0b @@ -0,0 +1 @@ +merged as: c789d126aacda9c5d2ccf3c51d669b1796180f66 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source
filter/source/msfilter/escherex.cxx | 36
1 file changed, 36 insertions(+)
New commits:
commit 60e55c7c2e9f9e6ad389b4527fa6332378e55e12
Author: Xisco Fauli
Date: Tue Mar 26 19:46:11 2013 +0100
remove duplicate declaration
Change-Id: I3ef565d61096189a9abe45a5a43951ceb7aff724
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 5af60c8..45e0d08 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3038,7 +3038,6 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" )
), sal_True ) )
{
MSO_GeoTextAlign gTextAlign =
mso_alignTextCenter;
-SdrFitToSizeType eFTS(
((SdrTextFitToSizeTypeItem&)pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE
)).GetValue() );
drawing::TextHorizontalAdjust eHA(
drawing::TextHorizontalAdjust_LEFT );
aAny >>= eHA;
switch( eHA )
commit 2003acca7b2ffc5a494182685e6983c90c39d137
Author: Andre Fischer
Date: Fri Jul 6 13:02:06 2012 +
#i119884# Fixed export of fontwork alignment.
Reported by: Li Feng Wang
Patch by: SunYing
Review by: Andre Fischer
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 25a8443..5af60c8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -70,6 +70,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3033,6 +3034,42 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
nTextPathFlags &=~0x20;
}
}
+//export gTextAlign attr
+if ( EscherPropertyValueHelper::GetPropertyValue(
aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" )
), sal_True ) )
+{
+MSO_GeoTextAlign gTextAlign =
mso_alignTextCenter;
+SdrFitToSizeType eFTS(
((SdrTextFitToSizeTypeItem&)pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE
)).GetValue() );
+drawing::TextHorizontalAdjust eHA(
drawing::TextHorizontalAdjust_LEFT );
+aAny >>= eHA;
+switch( eHA )
+{
+case drawing::TextHorizontalAdjust_LEFT :
+gTextAlign = mso_alignTextLeft;
+break;
+case drawing::TextHorizontalAdjust_CENTER:
+gTextAlign = mso_alignTextCenter;
+break;
+case drawing::TextHorizontalAdjust_RIGHT:
+gTextAlign = mso_alignTextRight;
+break;
+case drawing::TextHorizontalAdjust_BLOCK:
+{
+SdrFitToSizeType eFTS(
((SdrTextFitToSizeTypeItem&)pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE
)).GetValue() );
+if ( eFTS == SDRTEXTFIT_ALLLINES)
+{
+gTextAlign = mso_alignTextStretch;
+}
+else
+{
+gTextAlign = mso_alignTextWordJust;
+}
+break;
+}
+default:
+break;
+}
+AddOpt(DFF_Prop_gtextAlign,gTextAlign);
+}
}
if ( nTextPathFlags != nTextPathFlagsOrg )
AddOpt( DFF_Prop_gtextFStrikethrough,
nTextPathFlags );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 03/29b4224c70b3da850b7cfbe9166904984eef6a
03/29b4224c70b3da850b7cfbe9166904984eef6a |1 + 1 file changed, 1 insertion(+) New commits: commit 5eae412424f902da9fbc932636dae245b32076df Author: Xisco Fauli Date: Tue Mar 26 19:51:14 2013 +0100 Notes added by 'git notes add' diff --git a/03/29b4224c70b3da850b7cfbe9166904984eef6a b/03/29b4224c70b3da850b7cfbe9166904984eef6a new file mode 100644 index 000..faf13ea --- /dev/null +++ b/03/29b4224c70b3da850b7cfbe9166904984eef6a @@ -0,0 +1 @@ +merged as: 2003acca7b2ffc5a494182685e6983c90c39d137 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries helpcontent2 sc/source
dictionaries |2 +-
helpcontent2 |2 +-
sc/source/filter/excel/xlpivot.cxx | 14 ++
3 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 664dd908afe403836bdabc6da4f6fb0706b4f308
Author: Xisco Fauli
Date: Wed Mar 27 01:18:50 2013 +0100
Revert "Fix #119514#:Item lists are incorrectly imported"
This reverts commit 2d3f9fb97857fd8cfc732d3f5aa8f20b01e1cb35.
diff --git a/dictionaries b/dictionaries
index 350dc59..36776c3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
+Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
diff --git a/helpcontent2 b/helpcontent2
index aab9e88..341ef99 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aab9e2b7e799b6246caa6c40ca3d46e6220d
+Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b
diff --git a/sc/source/filter/excel/xlpivot.cxx
b/sc/source/filter/excel/xlpivot.cxx
index 8a902e0..84a6042 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -86,19 +86,9 @@ void XclPCItem::SetInteger( sal_Int16 nValue )
void XclPCItem::SetError( sal_uInt16 nError )
{
meType = EXC_PCITEM_ERROR;
+//! TODO convert error to string
maText = rtl::OUString();
mnError = nError;
-switch( nError )
-{
-case 0x00: maText = "#NULL!"; break;
-case 0x07: maText = "#DIV/0!"; break;
-case 0x0F: maText = "#VALUE!"; break;
-case 0x17: maText = "#REF!"; break;
-case 0x1D: maText = "#NAME?"; break;
-case 0x24: maText = "#NUM!"; break;
-case 0x2A: maText = "#N/A"; break;
-default: break;
-}
}
void XclPCItem::SetBool( bool bValue )
@@ -135,7 +125,7 @@ bool XclPCItem::IsEmpty() const
const rtl::OUString* XclPCItem::GetText() const
{
-return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText
: NULL;
+return (meType == EXC_PCITEM_TEXT) ? &maText : 0;
}
const double* XclPCItem::GetDouble() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b8/2b2622b130d58892109fd59551ae05c4f2b923
b8/2b2622b130d58892109fd59551ae05c4f2b923 |1 + 1 file changed, 1 insertion(+) New commits: commit 44783c1614ee88bac64862e5b21bf0d45aeb3d8b Author: Xisco Fauli Date: Wed Mar 27 01:31:31 2013 +0100 Notes added by 'git notes add' diff --git a/b8/2b2622b130d58892109fd59551ae05c4f2b923 b/b8/2b2622b130d58892109fd59551ae05c4f2b923 new file mode 100644 index 000..03c8811 --- /dev/null +++ b/b8/2b2622b130d58892109fd59551ae05c4f2b923 @@ -0,0 +1 @@ +merged as: c52851bf5603136fb58b828ff9e848aa0cdfbef0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cd/a5df083238440fe32ccf820b779d2d4e553014
cd/a5df083238440fe32ccf820b779d2d4e553014 |1 + 1 file changed, 1 insertion(+) New commits: commit 3ce545c02e119a193be2caa3efe1654b817d766a Author: Xisco Fauli Date: Wed Mar 27 01:33:08 2013 +0100 Notes added by 'git notes add' diff --git a/cd/a5df083238440fe32ccf820b779d2d4e553014 b/cd/a5df083238440fe32ccf820b779d2d4e553014 new file mode 100644 index 000..0ef288d --- /dev/null +++ b/cd/a5df083238440fe32ccf820b779d2d4e553014 @@ -0,0 +1 @@ +merged as: 79a6b5191961c5dcc91f6e0b0b63f2e61a933823 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/fe15fd8cfc00fe9bb894783f9ffb228d12568d
f1/fe15fd8cfc00fe9bb894783f9ffb228d12568d |1 + 1 file changed, 1 insertion(+) New commits: commit 1c2fc5fba7c3f58a619afbcfe18134ee3630264d Author: Xisco Fauli Date: Sun Mar 31 16:28:14 2013 +0200 Notes added by 'git notes add' diff --git a/f1/fe15fd8cfc00fe9bb894783f9ffb228d12568d b/f1/fe15fd8cfc00fe9bb894783f9ffb228d12568d new file mode 100644 index 000..cec2879 --- /dev/null +++ b/f1/fe15fd8cfc00fe9bb894783f9ffb228d12568d @@ -0,0 +1 @@ +merged as: 4313d73f1436f87d937ba10ee05b32bd363b125e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 25/86f214e48d0d63bd5a83addd48a285ee38e92f
25/86f214e48d0d63bd5a83addd48a285ee38e92f |1 + 1 file changed, 1 insertion(+) New commits: commit 388496ceb85683b1a09498d98751b1c90e467bce Author: Xisco Fauli Date: Sun Mar 31 16:29:30 2013 +0200 Notes added by 'git notes add' diff --git a/25/86f214e48d0d63bd5a83addd48a285ee38e92f b/25/86f214e48d0d63bd5a83addd48a285ee38e92f new file mode 100644 index 000..e3f8b76 --- /dev/null +++ b/25/86f214e48d0d63bd5a83addd48a285ee38e92f @@ -0,0 +1 @@ +merged as: f13cff6d71d237068c6af92eda271e5fc144be5a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 45/fc638e2fcb644aa4df5b1a62c4ddccac111802
45/fc638e2fcb644aa4df5b1a62c4ddccac111802 |1 + 1 file changed, 1 insertion(+) New commits: commit 17c66414a18d9468066e4144e9a38719d0ee8368 Author: Xisco Fauli Date: Sun Mar 31 16:32:21 2013 +0200 Notes added by 'git notes add' diff --git a/45/fc638e2fcb644aa4df5b1a62c4ddccac111802 b/45/fc638e2fcb644aa4df5b1a62c4ddccac111802 new file mode 100644 index 000..2e394dc --- /dev/null +++ b/45/fc638e2fcb644aa4df5b1a62c4ddccac111802 @@ -0,0 +1 @@ +merged as: 55011ce4784c0a116753ac725f88bd4327010a2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - eb/86e4a8ebcc8e105bd4950ed94c2e529320de4c
eb/86e4a8ebcc8e105bd4950ed94c2e529320de4c |1 + 1 file changed, 1 insertion(+) New commits: commit 1e74279a1c1b4a4aa7b7ad56abe3d1242468e530 Author: Xisco Fauli Date: Sun Mar 31 16:33:34 2013 +0200 Notes added by 'git notes add' diff --git a/eb/86e4a8ebcc8e105bd4950ed94c2e529320de4c b/eb/86e4a8ebcc8e105bd4950ed94c2e529320de4c new file mode 100644 index 000..1b991de --- /dev/null +++ b/eb/86e4a8ebcc8e105bd4950ed94c2e529320de4c @@ -0,0 +1 @@ +merged as: 1b6049cde6cc7e59c3621fdcfdec368315496017 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/17a318f8116ee37159c16cd35538bbe853f792
81/17a318f8116ee37159c16cd35538bbe853f792 |1 + 1 file changed, 1 insertion(+) New commits: commit e4a012c38d45318dfa89436612118bf5db42beaa Author: Xisco Fauli Date: Sun Mar 31 16:34:46 2013 +0200 Notes added by 'git notes add' diff --git a/81/17a318f8116ee37159c16cd35538bbe853f792 b/81/17a318f8116ee37159c16cd35538bbe853f792 new file mode 100644 index 000..8de6d2a --- /dev/null +++ b/81/17a318f8116ee37159c16cd35538bbe853f792 @@ -0,0 +1 @@ +merged as: ec585b964e26de967f0373da0d2d9dfd20f8866c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 18/9fe5d0857f429b031aa6fc32949f5d4638bac7
18/9fe5d0857f429b031aa6fc32949f5d4638bac7 |1 + 1 file changed, 1 insertion(+) New commits: commit 5885edb08299d9eb707643b8f5784e1f41eed114 Author: Xisco Fauli Date: Sun Mar 31 16:36:41 2013 +0200 Notes added by 'git notes add' diff --git a/18/9fe5d0857f429b031aa6fc32949f5d4638bac7 b/18/9fe5d0857f429b031aa6fc32949f5d4638bac7 new file mode 100644 index 000..4d20af2 --- /dev/null +++ b/18/9fe5d0857f429b031aa6fc32949f5d4638bac7 @@ -0,0 +1 @@ +merged as: 6cd346c5e8be9065a5578f2caf3f1eacd964e783 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 42/e6ec353f68123486ea72d5f3c7a9f447d5e58b
42/e6ec353f68123486ea72d5f3c7a9f447d5e58b |1 + 1 file changed, 1 insertion(+) New commits: commit 6d6b38713f9fba90a41916ff46fa51f4d5ef2ac2 Author: Xisco Fauli Date: Sun Mar 31 16:38:12 2013 +0200 Notes added by 'git notes add' diff --git a/42/e6ec353f68123486ea72d5f3c7a9f447d5e58b b/42/e6ec353f68123486ea72d5f3c7a9f447d5e58b new file mode 100644 index 000..c1f7ae8 --- /dev/null +++ b/42/e6ec353f68123486ea72d5f3c7a9f447d5e58b @@ -0,0 +1 @@ +merged as: c81f869a023966ffdfde75f743d70875da19e835 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 47/8b3a28a282e9525b8164b743b7503974259546
47/8b3a28a282e9525b8164b743b7503974259546 |1 + 1 file changed, 1 insertion(+) New commits: commit 79261539432002f22e83cefd66892c481276a88d Author: Xisco Fauli Date: Sun Mar 31 16:39:36 2013 +0200 Notes added by 'git notes add' diff --git a/47/8b3a28a282e9525b8164b743b7503974259546 b/47/8b3a28a282e9525b8164b743b7503974259546 new file mode 100644 index 000..116cdbd --- /dev/null +++ b/47/8b3a28a282e9525b8164b743b7503974259546 @@ -0,0 +1 @@ +merged as: bdd1a3e1001258a7af5366d73a24ecb3173dab70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c1/e8fbb282a2e17b5f358e856e0c950af3093df1
c1/e8fbb282a2e17b5f358e856e0c950af3093df1 |1 + 1 file changed, 1 insertion(+) New commits: commit 1d2edcaa2d3c3577fbb9d110273663b24ea5cc67 Author: Xisco Fauli Date: Sun Mar 31 16:41:17 2013 +0200 Notes added by 'git notes add' diff --git a/c1/e8fbb282a2e17b5f358e856e0c950af3093df1 b/c1/e8fbb282a2e17b5f358e856e0c950af3093df1 new file mode 100644 index 000..4b32f65 --- /dev/null +++ b/c1/e8fbb282a2e17b5f358e856e0c950af3093df1 @@ -0,0 +1 @@ +merged as: 61651ece1a1eaa5012c69e3b0b36fcddb2e37c71 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - filter/source sw/source
filter/source/msfilter/escherex.cxx | 18 ++
filter/source/msfilter/svdfppt.cxx | 10 ++
sw/source/filter/ww8/ww8par.cxx | 13 +++--
3 files changed, 27 insertions(+), 14 deletions(-)
New commits:
commit c6ba5edabc427bfddd850b1e8e586d5e440246c2
Author: Xisco Fauli
Date: Mon Apr 1 23:01:59 2013 +0200
Related to #120039: Remove RTL_CONSTASCII_USTRINGPARAM
Change-Id: Idc6bae019e972ad512158c71376f7995ab8cf2db
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 880cc51..6449ba8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1455,33 +1455,27 @@ sal_Bool
EscherPropertyContainer::CreateGraphicProperties(
if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT )
{
sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY =
0,nPosOffsetX = 0,nPosOffsetY = 0;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeX"
) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapSizeX", sal_True ) )
{
aAny >>= nSizeX;
}
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeY"
) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapSizeY", sal_True ) )
{
aAny >>= nSizeY;
}
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM(
"FillBitmapOffsetX" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapOffsetX", sal_True ) )
{
aAny >>= nOffsetX;
}
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM(
"FillBitmapOffsetY" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapOffsetY", sal_True ) )
{
aAny >>= nOffsetY;
}
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM(
"FillBitmapPositionOffsetX" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapPositionOffsetX", sal_True ) )
{
aAny >>= nPosOffsetX;
}
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet,
-String( RTL_CONSTASCII_USTRINGPARAM(
"FillBitmapPositionOffsetY" ) ), sal_True ) )
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny,
rXPropSet, "FillBitmapPositionOffsetY", sal_True ) )
{
aAny >>= nPosOffsetY;
}
commit 638678893657aaf90a3b6e1a6c4d3fb3fc28e954
Author: Lei De Bin
Date: Wed Jul 4 05:46:06 2012 +
Fix #119510# - fix some invalid FLY_AT_PARA case:
The width should be automatically re-sized, then for the horizontal
alignment left is
better than right.
Found by: yan ji
Patch by: Lei De Bin
Review by: Chen Zuo Jun
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: I584b81bf2f32e8ae41bd761f760672a33d1bfd73
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 621bdbb..f78da7b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1892,9 +1893,17 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long
nStart, long nLen,
SwFlyFrmFmt *pFrame = rDoc.MakeFlySection(FLY_AT_PARA, pPaM->GetPoint());
-pFrame->SetFmtAttr(SwFmtFrmSize(ATT_MIN_SIZE, nPageWidth, MINLAY));
+SwFmtAnchor aAnch( pFrame->GetAnchor() );
+aAnch.SetType( FLY_AT_PARA );
+pFrame->SetFmtAttr( aAnch );
+SwFmtFrmSize aSz(ATT_MIN_SIZE, nPageWidth, MINLAY);
+SwFrmSize eFrmSize = ATT_MIN_SIZE;
+if( eFrmSize != aSz.GetWidthSizeType() )
+aSz.SetWidthSizeType( eFrmSize );
+pFrame->SetFmtAttr(aSz);
pFrame->SetFmtAttr(SwFmtSurround(SURROUND_THROUGHT));
-pFrame->SetFmtAttr(SwFmtHoriOrient(0, text::HoriOrientation::RIGHT));
//iFOO
+pFrame->SetFmtAttr(SwFmtHoriOrient(0, te
[Libreoffice-commits] core.git: 3 commits - filter/source
filter/source/msfilter/svdfppt.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a9f03c1ad14890f2cd02ebfc1c2adfe9c2b55259
Author: Xisco Fauli
Date: Mon Apr 1 23:18:03 2013 +0200
Related to 119875: Remove RTL_CONSTASCII_USTRINGPARAM
Change-Id: I86461c14b5b73c3c7473b48bff70fd27f640ba59
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index d65254ba..6071eb6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7275,8 +7275,8 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference< XCell >& xCell )
//set textHorizontalAdjust and TextWritingMode attr
const sal_Int32 eHA(((const
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
const SvxFrameDirection eDirection = (const SvxFrameDirection)(((
const
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
-static const rtl::OUString sHorizontalAdjust(
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
-static const rtl::OUString sWritingMode(
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
+static const rtl::OUString sHorizontalAdjust( "TextHorizontalAdjust"
);
+static const rtl::OUString sWritingMode( "TextWritingMode" );
xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) );
if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
{//vertical writing
commit 460e17a1c7dae290ae9375e78820ec1257fe3942
Author: Sun Ying
Date: Thu Aug 16 02:13:43 2012 +
#119875# fix vertical text direction in table cell change when save .ppt
file
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 200e7b4..d65254ba 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7272,6 +7272,16 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference< XCell >& xCell )
eVA = drawing::TextVerticalAdjust_BOTTOM;
xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
+//set textHorizontalAdjust and TextWritingMode attr
+const sal_Int32 eHA(((const
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
+const SvxFrameDirection eDirection = (const SvxFrameDirection)(((
const
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
+static const rtl::OUString sHorizontalAdjust(
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
+static const rtl::OUString sWritingMode(
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
+xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) );
+if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
+{//vertical writing
+xPropSet->setPropertyValue( sWritingMode , Any(
::com::sun::star::text::WritingMode_TB_RL ) );
+}
SfxItemSet aSet( pObj->GetMergedItemSet() );
XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem(
XATTR_FILLSTYLE )).GetValue());
::com::sun::star::drawing::FillStyle eFS(
com::sun::star::drawing::FillStyle_NONE );
commit a9d8b4dfc103b991de6c4d99914a39acef93ad23
Author: Xisco Fauli
Date: Mon Apr 1 23:14:21 2013 +0200
Revert "Reported by: Li Feng Wang"
This reverts commit e518ef52bbda3449130f51dbbf6f0a60bb76298f.
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index d65254ba..200e7b4 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7272,16 +7272,6 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference< XCell >& xCell )
eVA = drawing::TextVerticalAdjust_BOTTOM;
xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
-//set textHorizontalAdjust and TextWritingMode attr
-const sal_Int32 eHA(((const
SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
-const SvxFrameDirection eDirection = (const SvxFrameDirection)(((
const
SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
-static const rtl::OUString sHorizontalAdjust(
RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) );
-static const rtl::OUString sWritingMode(
RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") );
-xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) );
-if ( eDirection == FRMDIR_VERT_TOP_RIGHT )
-{//vertical writing
-xPropSet->setPropertyValue( sWritingMode , Any(
::com::sun::star::text::WritingMode_TB_RL ) );
-}
SfxItemSet aSet( pObj->GetM
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - eb/35d2fe464df76f105f9a1514081495cc5ee3a7
eb/35d2fe464df76f105f9a1514081495cc5ee3a7 |1 + 1 file changed, 1 insertion(+) New commits: commit 4158a969bac2c78284a5970a7fc325fa85b722fe Author: Xisco Fauli Date: Mon Apr 1 23:22:52 2013 +0200 Notes added by 'git notes add' diff --git a/eb/35d2fe464df76f105f9a1514081495cc5ee3a7 b/eb/35d2fe464df76f105f9a1514081495cc5ee3a7 new file mode 100644 index 000..ea58867 --- /dev/null +++ b/eb/35d2fe464df76f105f9a1514081495cc5ee3a7 @@ -0,0 +1 @@ +merged as: 460e17a1c7dae290ae9375e78820ec1257fe3942 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41
fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 |1 + 1 file changed, 1 insertion(+) New commits: commit 8bce560dab7536efcb1e1d11adb616714d138366 Author: Xisco Fauli Date: Mon Apr 1 23:25:13 2013 +0200 Notes added by 'git notes add' diff --git a/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 b/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 new file mode 100644 index 000..281c559 --- /dev/null +++ b/fa/6c5d91da2ef372004b5ed563b9c5e3626a7a41 @@ -0,0 +1 @@ +merged as: 638678893657aaf90a3b6e1a6c4d3fb3fc28e954 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/4843f9d4fbd4db287300faa52ca6bda618aea1
51/4843f9d4fbd4db287300faa52ca6bda618aea1 |1 + 1 file changed, 1 insertion(+) New commits: commit bb41bb3098bab2fa6ff830143dfd913ef7ab67eb Author: Xisco Fauli Date: Tue Apr 2 07:24:50 2013 +0200 Notes added by 'git notes add' diff --git a/51/4843f9d4fbd4db287300faa52ca6bda618aea1 b/51/4843f9d4fbd4db287300faa52ca6bda618aea1 new file mode 100644 index 000..514bdd1 --- /dev/null +++ b/51/4843f9d4fbd4db287300faa52ca6bda618aea1 @@ -0,0 +1 @@ +merged as: 74700570730f7259a78c031973cbecd98ef777ff ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c6/302d8cf8522034ab795e13fa6bece88ab9057c
c6/302d8cf8522034ab795e13fa6bece88ab9057c |1 + 1 file changed, 1 insertion(+) New commits: commit d2f59702fa19203c3af44881f888a9ce12da78ef Author: Xisco Fauli Date: Tue Apr 2 07:26:56 2013 +0200 Notes added by 'git notes add' diff --git a/c6/302d8cf8522034ab795e13fa6bece88ab9057c b/c6/302d8cf8522034ab795e13fa6bece88ab9057c new file mode 100644 index 000..df10347 --- /dev/null +++ b/c6/302d8cf8522034ab795e13fa6bece88ab9057c @@ -0,0 +1 @@ +merged as: 95136e701c5f631307d1b72ad8adf6b3df9090fe ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7d/5520c591922f58a1bef59e39ad9f52d0c99165
7d/5520c591922f58a1bef59e39ad9f52d0c99165 |1 + 1 file changed, 1 insertion(+) New commits: commit 31e457f255b1649401a91b5ab25b406a71dcaa4d Author: Xisco Fauli Date: Tue Apr 2 07:29:00 2013 +0200 Notes added by 'git notes add' diff --git a/7d/5520c591922f58a1bef59e39ad9f52d0c99165 b/7d/5520c591922f58a1bef59e39ad9f52d0c99165 new file mode 100644 index 000..0fb99de --- /dev/null +++ b/7d/5520c591922f58a1bef59e39ad9f52d0c99165 @@ -0,0 +1 @@ +merged as: 80e187b58a2def63f8e779214adff3cf64294c8d ___ 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/filter/ww8/ww8par6.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit f6f836b693a9e04c9fa52dd8883a0da54f011dcf
Author: Xisco Fauli
Date: Wed Apr 3 23:24:44 2013 +0200
Revert "Fix issue i120718: after save the sample file with page border and
shadow to doc, the shadow depth and color changed"
This reverts commit ac4c6860961264d23504df90ccf805bd25be032f.
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c022db6..c37da4a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1398,9 +1398,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow,
const short *pSizeArray,
if (bRet)
{
rShadow.SetColor(Color(COL_BLACK));
-//i120718
-short nVal = pbrc[WW8_RIGHT].DetermineBorderProperties(bVer67);
-//End
+short nVal = pSizeArray[WW8_RIGHT];
if (nVal < 0x10)
nVal = 0x10;
rShadow.SetWidth(nVal);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/7f4d4db2fd12346742e366f48f91053227471b
5e/7f4d4db2fd12346742e366f48f91053227471b |1 + 1 file changed, 1 insertion(+) New commits: commit ef237b64043da432b80f892090199c9139793f58 Author: Xisco Fauli Date: Wed Apr 3 23:26:28 2013 +0200 Notes added by 'git notes add' diff --git a/5e/7f4d4db2fd12346742e366f48f91053227471b b/5e/7f4d4db2fd12346742e366f48f91053227471b new file mode 100644 index 000..d8e1a36 --- /dev/null +++ b/5e/7f4d4db2fd12346742e366f48f91053227471b @@ -0,0 +1 @@ +merged as: cc2dd35b24f9ddf14d423cd5f099987223fd6960 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/ww8/ww8atr.cxx |7 +++
sw/source/filter/ww8/ww8graf2.cxx |8 +++-
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 9924d6d61af506a6d9cb1fdbe35af220ad2135fb
Author: Xisco Fauli
Date: Fri Apr 5 23:07:14 2013 +0200
Fix issue i120716: The graphic's border size and spacing is not correct
* source/filter/ww8/ww8graf2.cxx
MS Word Binary compatibility
Patch by: Fan Zheng,
Found by: dongjun zong,
Review by: Jian Hong Cheng,(cherry picked from commit
d91933a4fddd16e2997f7bc945424a97a540a8d3)
Change-Id: I63faa611317b554af3d34372ea0d4c8c2cbc4bfb
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index b9f90a0..d98543b 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -599,11 +599,9 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
aAttrSet.Put(aFlySet);
}
-
-Rectangle aInnerDist( pRecord->nDxTextLeft,
-pRecord->nDyTextTop, pRecord->nDxTextRight,
-pRecord->nDyTextBottom );
-
+//Modified for i120716,for graf importing from MS Word
2003 binary format,
+//there is no border distance.
+Rectangle aInnerDist(0,0,0,0);
MatchSdrItemsIntoFlySet( pObject, aAttrSet,
pRecord->eLineStyle, pRecord->eLineDashing,
pRecord->eShapeType, aInnerDist );
commit a2951d8cc1518638b357dfb09edafff7194b9eb3
Author: Jian Hong Cheng
Date: Wed Aug 22 04:17:49 2012 +
Fix issue #i119649: Hyperlink font size increased if saved to .doc file
* sw/source/filter/ww8/ww8atr.cxx
MS Word Binary compatibility
Patch by: Chen Peng,
Found by: Yan Ji,
Review by: Jian Hong Cheng,
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3210c5f..0b18e29 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -229,6 +229,13 @@ void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems
&rItems, sal_uInt16 n
sal_uInt16 nWhich = pItem->Which();
if ( ( isCHRATR( nWhich ) || isTXTATR( nWhich ) ) &&
CollapseScriptsforWordOk( nScript, nWhich ) )
{
+ //In the id definition, RES_TXTATR_INETFMT must precede
RES_TXTATR_CHARFMT, so that link style can overwrite char style.
+ //and in #i24291# it describes "All we want to do is ensure for
now is that if a charfmt exist in the character
+ //properties that it rises to the top and is exported first."
+ //In bug 119649, it is in such situation, so we need to ignore
the link style when doing ms word filter exports and
+ //add the second judgement for #i24291# definition.
+ if ( nWhich == RES_TXTATR_INETFMT && (
rItems.begin()->second->Which() == RES_TXTATR_CHARFMT ) )
+ continue;
AttrOutput().OutputItem( *pItem );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d9/1933a4fddd16e2997f7bc945424a97a540a8d3
d9/1933a4fddd16e2997f7bc945424a97a540a8d3 |1 + 1 file changed, 1 insertion(+) New commits: commit d07ac9dcabbf4d52309e9d7d22a20dfab6f66858 Author: Xisco Fauli Date: Fri Apr 5 23:21:42 2013 +0200 Notes added by 'git notes add' diff --git a/d9/1933a4fddd16e2997f7bc945424a97a540a8d3 b/d9/1933a4fddd16e2997f7bc945424a97a540a8d3 new file mode 100644 index 000..7e3456d --- /dev/null +++ b/d9/1933a4fddd16e2997f7bc945424a97a540a8d3 @@ -0,0 +1 @@ +merged as: 9924d6d61af506a6d9cb1fdbe35af220ad2135fb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f0/fc2a2b4ee5190fe9d979100f47d3806d710d6e
f0/fc2a2b4ee5190fe9d979100f47d3806d710d6e |1 + 1 file changed, 1 insertion(+) New commits: commit 97f563e362fc1015a80ef0d71fae29446710b9f1 Author: Xisco Fauli Date: Fri Apr 5 23:23:13 2013 +0200 Notes added by 'git notes add' diff --git a/f0/fc2a2b4ee5190fe9d979100f47d3806d710d6e b/f0/fc2a2b4ee5190fe9d979100f47d3806d710d6e new file mode 100644 index 000..4ed9cc4 --- /dev/null +++ b/f0/fc2a2b4ee5190fe9d979100f47d3806d710d6e @@ -0,0 +1 @@ +merged as: a2951d8cc1518638b357dfb09edafff7194b9eb3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/720990bd3691222363bb2d674b7d39a0d8829f
e5/720990bd3691222363bb2d674b7d39a0d8829f |1 + 1 file changed, 1 insertion(+) New commits: commit ca44b393cc3846a0c593bed7be484e15ebb5d44b Author: Xisco Fauli Date: Sun Apr 7 23:41:19 2013 +0200 Notes added by 'git notes add' diff --git a/e5/720990bd3691222363bb2d674b7d39a0d8829f b/e5/720990bd3691222363bb2d674b7d39a0d8829f new file mode 100644 index 000..9f28af4 --- /dev/null +++ b/e5/720990bd3691222363bb2d674b7d39a0d8829f @@ -0,0 +1 @@ +merged as: 7a90044df279e1ec2336e7c398fa938a6fa3ad56 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/f7599d7ec5f3c14a42cd5dc94519fead070cfd
70/f7599d7ec5f3c14a42cd5dc94519fead070cfd |1 + 1 file changed, 1 insertion(+) New commits: commit 8289430cccef1db39981db5aa389ec05b9de53ef Author: Xisco Fauli Date: Sun Apr 7 23:42:25 2013 +0200 Notes added by 'git notes add' diff --git a/70/f7599d7ec5f3c14a42cd5dc94519fead070cfd b/70/f7599d7ec5f3c14a42cd5dc94519fead070cfd new file mode 100644 index 000..42ae44e --- /dev/null +++ b/70/f7599d7ec5f3c14a42cd5dc94519fead070cfd @@ -0,0 +1 @@ +merged as: 67f9ccaebf0f79f9e51717d5365aee1b9bcbd486 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/1449731638d6432fb9adfef3a8a303ad9bf76b
bf/1449731638d6432fb9adfef3a8a303ad9bf76b |1 + 1 file changed, 1 insertion(+) New commits: commit 9d70294bba1aa7f9b5609430abae48e03bc043a0 Author: Xisco Fauli Date: Sun Apr 7 23:43:35 2013 +0200 Notes added by 'git notes add' diff --git a/bf/1449731638d6432fb9adfef3a8a303ad9bf76b b/bf/1449731638d6432fb9adfef3a8a303ad9bf76b new file mode 100644 index 000..5add976 --- /dev/null +++ b/bf/1449731638d6432fb9adfef3a8a303ad9bf76b @@ -0,0 +1 @@ +merged as: 461c262eb93412b46cc73a28932afdcbaeb34748 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f2/bb9c92958a9c1c464c82e1129b8de4be0159cb
f2/bb9c92958a9c1c464c82e1129b8de4be0159cb |1 + 1 file changed, 1 insertion(+) New commits: commit ac6d61a30dd27a741fa898525c0f589f9570d5e7 Author: Xisco Fauli Date: Sun Apr 7 23:45:02 2013 +0200 Notes added by 'git notes add' diff --git a/f2/bb9c92958a9c1c464c82e1129b8de4be0159cb b/f2/bb9c92958a9c1c464c82e1129b8de4be0159cb new file mode 100644 index 000..d5e74b7e --- /dev/null +++ b/f2/bb9c92958a9c1c464c82e1129b8de4be0159cb @@ -0,0 +1 @@ +merged as: b619ffdbb3656bc01a603afb26caea8a483bc5ec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6f/a2e38b9cd3ce0df5876d849bcba7d879a6e329
6f/a2e38b9cd3ce0df5876d849bcba7d879a6e329 |1 + 1 file changed, 1 insertion(+) New commits: commit 5bdf345038c830460415029491dc63b8031f8987 Author: Xisco Fauli Date: Sun Apr 7 23:46:22 2013 +0200 Notes added by 'git notes add' diff --git a/6f/a2e38b9cd3ce0df5876d849bcba7d879a6e329 b/6f/a2e38b9cd3ce0df5876d849bcba7d879a6e329 new file mode 100644 index 000..0064ff9 --- /dev/null +++ b/6f/a2e38b9cd3ce0df5876d849bcba7d879a6e329 @@ -0,0 +1 @@ +merged as: 844e62d5ab9ddc77a1ea859653549ea71bcb6656 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 98/0ee15bad53f765a0df1a4507befc9184fc0c63
98/0ee15bad53f765a0df1a4507befc9184fc0c63 |1 + 1 file changed, 1 insertion(+) New commits: commit c2c8dc708956ec9a49b58830e9478654ce2d12e1 Author: Xisco Fauli Date: Sun Apr 7 23:47:53 2013 +0200 Notes added by 'git notes add' diff --git a/98/0ee15bad53f765a0df1a4507befc9184fc0c63 b/98/0ee15bad53f765a0df1a4507befc9184fc0c63 new file mode 100644 index 000..785bb33 --- /dev/null +++ b/98/0ee15bad53f765a0df1a4507befc9184fc0c63 @@ -0,0 +1 @@ +merged as: 8b5cd38aae487dc2a84a1ee0f56e25daca851b02 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/25f6c6441b49093504874925f37ca0e61f34f9
70/25f6c6441b49093504874925f37ca0e61f34f9 |1 + 1 file changed, 1 insertion(+) New commits: commit dd33929cff532ace1979f8061490796bd74dd1fa Author: Xisco Fauli Date: Sun Apr 7 23:49:20 2013 +0200 Notes added by 'git notes add' diff --git a/70/25f6c6441b49093504874925f37ca0e61f34f9 b/70/25f6c6441b49093504874925f37ca0e61f34f9 new file mode 100644 index 000..857bda1 --- /dev/null +++ b/70/25f6c6441b49093504874925f37ca0e61f34f9 @@ -0,0 +1 @@ +merged as: ad2651af85181235a0c3a44bf93d7ecb08dd9353 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/48fc9e9708916dd24fe64646486db0d90996c7
f8/48fc9e9708916dd24fe64646486db0d90996c7 |1 + 1 file changed, 1 insertion(+) New commits: commit 92beb86e0816c6073001858e61d023f2b8d5c1e1 Author: Xisco Fauli Date: Sun Apr 7 23:50:25 2013 +0200 Notes added by 'git notes add' diff --git a/f8/48fc9e9708916dd24fe64646486db0d90996c7 b/f8/48fc9e9708916dd24fe64646486db0d90996c7 new file mode 100644 index 000..98a94d2 --- /dev/null +++ b/f8/48fc9e9708916dd24fe64646486db0d90996c7 @@ -0,0 +1 @@ +merged as: 7ec7a9a68b4a9c5600840a34434fc800cda3d815 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9b/4e6064f9598c834a9c36c39932f3e326419d44
9b/4e6064f9598c834a9c36c39932f3e326419d44 |1 + 1 file changed, 1 insertion(+) New commits: commit 93d7daff88a5b9d7f71947e73f5813f65ca3d327 Author: Xisco Fauli Date: Sun Apr 7 23:51:30 2013 +0200 Notes added by 'git notes add' diff --git a/9b/4e6064f9598c834a9c36c39932f3e326419d44 b/9b/4e6064f9598c834a9c36c39932f3e326419d44 new file mode 100644 index 000..3499ad6 --- /dev/null +++ b/9b/4e6064f9598c834a9c36c39932f3e326419d44 @@ -0,0 +1 @@ +merged as: b86cf0421b432ebbf964960f0fcd2e6a5360f979 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/969d29b354467c659abe79541a4f5e7b92b0ef
00/969d29b354467c659abe79541a4f5e7b92b0ef |1 + 1 file changed, 1 insertion(+) New commits: commit 87394af36200274aaf94226e2ec71db6bcfb245c Author: Xisco Fauli Date: Sun Apr 7 23:52:32 2013 +0200 Notes added by 'git notes add' diff --git a/00/969d29b354467c659abe79541a4f5e7b92b0ef b/00/969d29b354467c659abe79541a4f5e7b92b0ef new file mode 100644 index 000..2a8f545 --- /dev/null +++ b/00/969d29b354467c659abe79541a4f5e7b92b0ef @@ -0,0 +1 @@ +merged as: ed6d89dd55cff5ca91ecbfc8716a4e6c584be165 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540
df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 |1 + 1 file changed, 1 insertion(+) New commits: commit 47fde97af3fe04d9a3e87b1af1847ffa127c Author: Xisco Fauli Date: Sun Apr 7 23:53:34 2013 +0200 Notes added by 'git notes add' diff --git a/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 b/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 new file mode 100644 index 000..f461b8f --- /dev/null +++ b/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 @@ -0,0 +1 @@ +merged as: a72e3ed81a0d619b81074cb80d7ef9d3d11feda6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f7/da26f51bfaddecd7b774bc237d6f5fa082e57c
f7/da26f51bfaddecd7b774bc237d6f5fa082e57c |1 + 1 file changed, 1 insertion(+) New commits: commit ddd0a755224f8a01ca22ea7e7be2dee9d374ec2b Author: Xisco Fauli Date: Mon Apr 8 22:16:02 2013 +0200 Notes added by 'git notes add' diff --git a/f7/da26f51bfaddecd7b774bc237d6f5fa082e57c b/f7/da26f51bfaddecd7b774bc237d6f5fa082e57c new file mode 100644 index 000..de5b7f7 --- /dev/null +++ b/f7/da26f51bfaddecd7b774bc237d6f5fa082e57c @@ -0,0 +1 @@ +merged as: aac0ada9914c87c8c1c017744548602374f80320 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textparagraph.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aaeafc323ef77995950dd7337ee35886dd45e543 Author: Xisco Fauli Date: Mon Apr 8 23:37:32 2013 +0200 Fix again n719988, n734733 Bullet should have same color as following text by default Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8 Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573 diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index bab0ecd..4679858 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -110,13 +110,14 @@ void TextParagraph::insertAt( TextParagraphProperties aParaProp; aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( maProperties ); -aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); // bullets have same color as following texts by default if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); + +aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); } // empty paragraphs do not have bullets in ppt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/070c9d4082f640e131038a47b18af47196b901
69/070c9d4082f640e131038a47b18af47196b901 |1 + 1 file changed, 1 insertion(+) New commits: commit 9ae509f2743ac3cb2583c821b6579b145ded6059 Author: Xisco Fauli Date: Mon Apr 8 23:46:58 2013 +0200 Notes added by 'git notes add' diff --git a/69/070c9d4082f640e131038a47b18af47196b901 b/69/070c9d4082f640e131038a47b18af47196b901 new file mode 100644 index 000..79c3899 --- /dev/null +++ b/69/070c9d4082f640e131038a47b18af47196b901 @@ -0,0 +1 @@ +prefer: aaeafc323ef77995950dd7337ee35886dd45e543 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source
oox/source/drawingml/textparagraph.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 967ec79447aad739a2b861bb1bf784bf55b22d9d Author: Xisco Fauli Date: Mon Apr 8 23:37:32 2013 +0200 Fix again n719988, n734733 Bullet should have same color as following text by default Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8 Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573 diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 1119652f..3256f3b 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -111,13 +111,14 @@ void TextParagraph::insertAt( TextParagraphProperties aParaProp; aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( maProperties ); -aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); // bullets have same color as following texts by default if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); + +aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); } // empty paragraphs do not have bullets in ppt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/d3c3ae1938c5ca8e037af70442885847a56992
8f/d3c3ae1938c5ca8e037af70442885847a56992 |1 + 1 file changed, 1 insertion(+) New commits: commit 47d6532f3726acd46fc709fa79d754e722566608 Author: Xisco Fauli Date: Fri May 17 17:32:31 2013 +0200 Notes added by 'git notes add' diff --git a/8f/d3c3ae1938c5ca8e037af70442885847a56992 b/8f/d3c3ae1938c5ca8e037af70442885847a56992 new file mode 100644 index 000..9f91f4a --- /dev/null +++ b/8f/d3c3ae1938c5ca8e037af70442885847a56992 @@ -0,0 +1 @@ +prefer: 99501a839f6d777c24bc9210787fd14dc3aad67d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3e/6d8e9005a1defb0711e432fb3852274a511a35
3e/6d8e9005a1defb0711e432fb3852274a511a35 |1 + 1 file changed, 1 insertion(+) New commits: commit c77fe2fcc5e34e4dd6e7eee9d1a61235f8b56111 Author: Xisco Fauli Date: Sat May 18 18:20:30 2013 +0200 Notes added by 'git notes add' diff --git a/3e/6d8e9005a1defb0711e432fb3852274a511a35 b/3e/6d8e9005a1defb0711e432fb3852274a511a35 new file mode 100644 index 000..c44fb29 --- /dev/null +++ b/3e/6d8e9005a1defb0711e432fb3852274a511a35 @@ -0,0 +1 @@ +prefer: bea63709d05514555d5283279cd66439f4ceed73 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/eb33712db6022ed24f216838e8ea4c0a19d5db
aa/eb33712db6022ed24f216838e8ea4c0a19d5db |1 + 1 file changed, 1 insertion(+) New commits: commit 139b80d7ba8c6b1d49042ab227aeaf8c7341f083 Author: Xisco Fauli Date: Sat May 18 18:28:09 2013 +0200 Notes added by 'git notes add' diff --git a/aa/eb33712db6022ed24f216838e8ea4c0a19d5db b/aa/eb33712db6022ed24f216838e8ea4c0a19d5db new file mode 100644 index 000..fa1a9b5 --- /dev/null +++ b/aa/eb33712db6022ed24f216838e8ea4c0a19d5db @@ -0,0 +1 @@ +merged as: 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 52/92af4ee6a51033587cd8463277da5420e83a72
52/92af4ee6a51033587cd8463277da5420e83a72 |1 + 1 file changed, 1 insertion(+) New commits: commit c88155c829f4e71b9976188cf66898e8fd2cc488 Author: Xisco Fauli Date: Sat May 18 18:29:13 2013 +0200 Notes added by 'git notes add' diff --git a/52/92af4ee6a51033587cd8463277da5420e83a72 b/52/92af4ee6a51033587cd8463277da5420e83a72 new file mode 100644 index 000..fa1a9b5 --- /dev/null +++ b/52/92af4ee6a51033587cd8463277da5420e83a72 @@ -0,0 +1 @@ +merged as: 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 74/0f4eb387e63b35ac1784a7a143315df22d1892
74/0f4eb387e63b35ac1784a7a143315df22d1892 |1 + 1 file changed, 1 insertion(+) New commits: commit 0d706fa9f2a74ed92bbea67f7ac1e0b34a4f3465 Author: Xisco Fauli Date: Sat May 18 18:30:21 2013 +0200 Notes added by 'git notes add' diff --git a/74/0f4eb387e63b35ac1784a7a143315df22d1892 b/74/0f4eb387e63b35ac1784a7a143315df22d1892 new file mode 100644 index 000..fa1a9b5 --- /dev/null +++ b/74/0f4eb387e63b35ac1784a7a143315df22d1892 @@ -0,0 +1 @@ +merged as: 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/0cd925bebb0c7d3513db311b185a04f259b68d
2a/0cd925bebb0c7d3513db311b185a04f259b68d |1 + 1 file changed, 1 insertion(+) New commits: commit 68fe44b18f6c98929509b218e96a2d7947026e9d Author: Xisco Fauli Date: Sat May 18 18:32:12 2013 +0200 Notes added by 'git notes add' diff --git a/2a/0cd925bebb0c7d3513db311b185a04f259b68d b/2a/0cd925bebb0c7d3513db311b185a04f259b68d new file mode 100644 index 000..fa1a9b5 --- /dev/null +++ b/2a/0cd925bebb0c7d3513db311b185a04f259b68d @@ -0,0 +1 @@ +merged as: 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7b/3f5521bd3c400cd9e08b745176b4ce40885011
7b/3f5521bd3c400cd9e08b745176b4ce40885011 |1 + 1 file changed, 1 insertion(+) New commits: commit 13c47d8ffbbdd6c77fe5b2b0bccf84df438f4553 Author: Xisco Fauli Date: Sat May 18 19:11:07 2013 +0200 Notes added by 'git notes add' diff --git a/7b/3f5521bd3c400cd9e08b745176b4ce40885011 b/7b/3f5521bd3c400cd9e08b745176b4ce40885011 new file mode 100644 index 000..50b7dc6 --- /dev/null +++ b/7b/3f5521bd3c400cd9e08b745176b4ce40885011 @@ -0,0 +1 @@ +merged as: f9da1991ed0cf5936797d92f004462dbe93f1be7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 19/abb8de7e218ba08b2fa79c0379844303da328a
19/abb8de7e218ba08b2fa79c0379844303da328a |1 + 1 file changed, 1 insertion(+) New commits: commit 8eb14aaff4d5daa4d8a9dc4fb17323fea34a4896 Author: Xisco Fauli Date: Sat May 18 19:12:41 2013 +0200 Notes added by 'git notes add' diff --git a/19/abb8de7e218ba08b2fa79c0379844303da328a b/19/abb8de7e218ba08b2fa79c0379844303da328a new file mode 100644 index 000..d19d48a --- /dev/null +++ b/19/abb8de7e218ba08b2fa79c0379844303da328a @@ -0,0 +1 @@ +merged as: 7d2c9ac5c12232c15d21ee83387c31847553de80 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/114c242bb21950fd8ea01885c2269744d0fc6f
6e/114c242bb21950fd8ea01885c2269744d0fc6f |1 + 1 file changed, 1 insertion(+) New commits: commit 536f11067f6e33de484606bc26b16d8d0022699c Author: Xisco Fauli Date: Sat May 18 19:14:39 2013 +0200 Notes added by 'git notes add' diff --git a/6e/114c242bb21950fd8ea01885c2269744d0fc6f b/6e/114c242bb21950fd8ea01885c2269744d0fc6f new file mode 100644 index 000..7c63b0d --- /dev/null +++ b/6e/114c242bb21950fd8ea01885c2269744d0fc6f @@ -0,0 +1 @@ +merged as: 14589274cddd3f9ef844cc1aff20e106a977 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/f38bc7f1a2b4857bca517b0a5249136b15f79c
c0/f38bc7f1a2b4857bca517b0a5249136b15f79c |1 + 1 file changed, 1 insertion(+) New commits: commit 258b0800c6ecef1bc21e01f6c2aa5eae757d04b9 Author: Xisco Fauli Date: Sat May 18 22:31:17 2013 +0200 Notes added by 'git notes add' diff --git a/c0/f38bc7f1a2b4857bca517b0a5249136b15f79c b/c0/f38bc7f1a2b4857bca517b0a5249136b15f79c new file mode 100644 index 000..fe529be --- /dev/null +++ b/c0/f38bc7f1a2b4857bca517b0a5249136b15f79c @@ -0,0 +1 @@ +prefer: 432b6ab482d6fcef05514ab17e4bc762ee552139 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/e60e0bdee5db5cab13b986645a90b84ac764a2
0e/e60e0bdee5db5cab13b986645a90b84ac764a2 |1 + 1 file changed, 1 insertion(+) New commits: commit d890637f5e936accaa9d631f1090229913e56b99 Author: Xisco Fauli Date: Sat May 18 23:24:48 2013 +0200 Notes added by 'git notes add' diff --git a/0e/e60e0bdee5db5cab13b986645a90b84ac764a2 b/0e/e60e0bdee5db5cab13b986645a90b84ac764a2 new file mode 100644 index 000..611e654 --- /dev/null +++ b/0e/e60e0bdee5db5cab13b986645a90b84ac764a2 @@ -0,0 +1 @@ +merged as: 837e2808f7ed0ef7e40f2596a7a1781b52b606a2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1
aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 |1 + 1 file changed, 1 insertion(+) New commits: commit 27f66e7996bd48bfd37f9a22885ae65c50844274 Author: Xisco Fauli Date: Sun May 19 12:37:33 2013 +0200 Notes added by 'git notes add' diff --git a/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 b/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 new file mode 100644 index 000..7272fdb --- /dev/null +++ b/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 @@ -0,0 +1 @@ +merged as: 0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5
5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 |1 + 1 file changed, 1 insertion(+) New commits: commit 322a99ae9c3ea0ef00085d89772f19d829e16f43 Author: Xisco Fauli Date: Sun May 19 18:53:32 2013 +0200 Notes added by 'git notes add' diff --git a/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 b/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 new file mode 100644 index 000..dc6b334 --- /dev/null +++ b/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 @@ -0,0 +1 @@ +merged as: b4d1fd3cca027ceecc1230e35c15b5363a591906 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 34/73dbf606f525d95b898a08072259018eb4056f
34/73dbf606f525d95b898a08072259018eb4056f |1 + 1 file changed, 1 insertion(+) New commits: commit 04512f92f5ea1a41eebda7ac0a4e33410a0cc111 Author: Xisco Fauli Date: Sun May 19 18:55:06 2013 +0200 Notes added by 'git notes add' diff --git a/34/73dbf606f525d95b898a08072259018eb4056f b/34/73dbf606f525d95b898a08072259018eb4056f new file mode 100644 index 000..32de729 --- /dev/null +++ b/34/73dbf606f525d95b898a08072259018eb4056f @@ -0,0 +1 @@ +merged as: e820522037ff95818b9a40dfd77671f84c714cd5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 49/04b17b657750e565e30d56810da513057fba39
49/04b17b657750e565e30d56810da513057fba39 |1 + 1 file changed, 1 insertion(+) New commits: commit cb417f23f20ee53468cf47432360504acefa972b Author: Xisco Fauli Date: Sun May 19 18:56:49 2013 +0200 Notes added by 'git notes add' diff --git a/49/04b17b657750e565e30d56810da513057fba39 b/49/04b17b657750e565e30d56810da513057fba39 new file mode 100644 index 000..39eba5d --- /dev/null +++ b/49/04b17b657750e565e30d56810da513057fba39 @@ -0,0 +1 @@ +merged as: 73d23a54b8b930520788c891ddb12562198e94e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3a/125c8efe2af8f15e4606558063ffab64da0566
3a/125c8efe2af8f15e4606558063ffab64da0566 |1 + 1 file changed, 1 insertion(+) New commits: commit 074a58e97f6aeea39db125d7f8f311b2535174d8 Author: Xisco Fauli Date: Mon May 20 20:12:12 2013 +0200 Notes added by 'git notes add' diff --git a/3a/125c8efe2af8f15e4606558063ffab64da0566 b/3a/125c8efe2af8f15e4606558063ffab64da0566 new file mode 100644 index 000..220a690 --- /dev/null +++ b/3a/125c8efe2af8f15e4606558063ffab64da0566 @@ -0,0 +1 @@ +prefer: 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/53b457faaf0fc50a8b38d17bf219de427a1044
aa/53b457faaf0fc50a8b38d17bf219de427a1044 |1 + 1 file changed, 1 insertion(+) New commits: commit 698d30b7283733308d4ff717a13773133d01fa4d Author: Xisco Fauli Date: Mon May 20 23:07:33 2013 +0200 Notes added by 'git notes add' diff --git a/aa/53b457faaf0fc50a8b38d17bf219de427a1044 b/aa/53b457faaf0fc50a8b38d17bf219de427a1044 new file mode 100644 index 000..233e9ef --- /dev/null +++ b/aa/53b457faaf0fc50a8b38d17bf219de427a1044 @@ -0,0 +1 @@ +merged as: 0063e19b339b58d919a2348de492a3bd8de57280 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d6/870e145cc7373a422b414c31380cc1399e64cc
d6/870e145cc7373a422b414c31380cc1399e64cc |1 + 1 file changed, 1 insertion(+) New commits: commit 69972b85fcf91da84354cc45c269041f8be6102e Author: Xisco Fauli Date: Mon May 20 23:08:42 2013 +0200 Notes added by 'git notes add' diff --git a/d6/870e145cc7373a422b414c31380cc1399e64cc b/d6/870e145cc7373a422b414c31380cc1399e64cc new file mode 100644 index 000..f4b2ed2 --- /dev/null +++ b/d6/870e145cc7373a422b414c31380cc1399e64cc @@ -0,0 +1 @@ +merged as: 40a5d22fd4117f8e3ad6807264fb448f4d9959aa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ab/a80407aa9f78b5cf5d9fe8e2f66d4c67bf0174
ab/a80407aa9f78b5cf5d9fe8e2f66d4c67bf0174 |1 + 1 file changed, 1 insertion(+) New commits: commit 40a5589fbe006284cd5f66695f1fe3b9956024b1 Author: Xisco Fauli Date: Thu May 23 00:37:47 2013 +0200 Notes added by 'git notes add' diff --git a/ab/a80407aa9f78b5cf5d9fe8e2f66d4c67bf0174 b/ab/a80407aa9f78b5cf5d9fe8e2f66d4c67bf0174 new file mode 100644 index 000..1cb265e --- /dev/null +++ b/ab/a80407aa9f78b5cf5d9fe8e2f66d4c67bf0174 @@ -0,0 +1 @@ +reject: this should be done in the chart engine. Besides it only applies for the numerical data ___ 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/filter/ww8/ww8par6.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6e2ff4edb2aae441142280ef31286f4627347fb8
Author: Xisco Fauli
Date: Thu May 23 01:38:54 2013 +0200
oups, I shouldn't have commited it
Change-Id: I0b7433431c2da50c17f46549cde30b2b0131c61f
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c33eec1..0d9a638 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1396,8 +1396,8 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow,
const short *pSizeArray,
: (pbrc[WW8_RIGHT].aBits2[ 1 ] & 0x20 ) )
&& (pSizeArray && pSizeArray[WW8_RIGHT])
);
-//if (bRet)
-//{
+if (bRet)
+{
rShadow.SetColor(Color(COL_BLACK));
short nVal = pSizeArray[WW8_RIGHT];
if (nVal < 0x10)
@@ -1405,7 +1405,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow,
const short *pSizeArray,
rShadow.SetWidth(nVal);
rShadow.SetLocation(SVX_SHADOW_BOTTOMRIGHT);
bRet = true;
-//}
+}
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fe/7e723a727f6def90ee80ef2964a40546b37a90
fe/7e723a727f6def90ee80ef2964a40546b37a90 |1 + 1 file changed, 1 insertion(+) New commits: commit cdb51d9aa825d2bc4bf26343c36bf91ff2e2ecc1 Author: Xisco Fauli Date: Thu May 23 01:42:08 2013 +0200 Notes added by 'git notes add' diff --git a/fe/7e723a727f6def90ee80ef2964a40546b37a90 b/fe/7e723a727f6def90ee80ef2964a40546b37a90 new file mode 100644 index 000..4583636 --- /dev/null +++ b/fe/7e723a727f6def90ee80ef2964a40546b37a90 @@ -0,0 +1 @@ +merged as: 8943478b8d34216d3f2d64dfccd48d181d1a0f91 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 43/ff744cb9411b13860c3c57f7a052a6ab56001e
43/ff744cb9411b13860c3c57f7a052a6ab56001e |1 + 1 file changed, 1 insertion(+) New commits: commit 497c23c35b938c37786f53755bcd26c173be0b90 Author: Xisco Fauli Date: Wed May 29 01:38:08 2013 +0200 Notes added by 'git notes add' diff --git a/43/ff744cb9411b13860c3c57f7a052a6ab56001e b/43/ff744cb9411b13860c3c57f7a052a6ab56001e new file mode 100644 index 000..5b12aeb --- /dev/null +++ b/43/ff744cb9411b13860c3c57f7a052a6ab56001e @@ -0,0 +1 @@ +merged as: 60790b3f0ccc1779bcff2ddcc278a9027aedabee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/oox oox/source
include/oox/drawingml/table/tableproperties.hxx |2
oox/source/drawingml/table/tableproperties.cxx | 146 +++-
2 files changed, 145 insertions(+), 3 deletions(-)
New commits:
commit 355329a3cdbd8e4f2b7c6032ba0538a9a2a13d86
Author: Xisco Fauli
Date: Sun Jun 2 23:58:27 2013 +0200
Don't merge this file
Change-Id: I5efca8bf4969252198e06ac3309064e8d69c0e55
diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx
b/oox/inc/oox/drawingml/table/tableproperties.hxx
deleted file mode 100644
index 2928966..000
--- a/oox/inc/oox/drawingml/table/tableproperties.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-
-#ifndef OOX_DRAWINGML_TABLEPROPERTIES_HXX
-#define OOX_DRAWINGML_TABLEPROPERTIES_HXX
-
-#include "oox/drawingml/table/tablerow.hxx"
-#include "oox/drawingml/table/tablestyle.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/color.hxx"
-
-#include
-#include
-#include
-#include
-
-namespace oox { namespace drawingml { namespace table {
-
-class TableProperties
-{
-public:
-
-TableProperties();
-~TableProperties();
-
-std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; };
-std::vector< TableRow >& getTableRows() { return mvTableRows; };
-
-rtl::OUString& getStyleId(){ return maStyleId; };
-boost::shared_ptr< TableStyle >&getTableStyle(){ return mpTableStyle;
};
-sal_Bool& isRtl(){ return mbRtl; };
-sal_Bool& isFirstRow(){ return mbFirstRow; };
-sal_Bool& isFirstCol(){ return mbFirstCol; };
-sal_Bool& isLastRow(){ return mbLastRow; };
-sal_Bool& isLastCol(){ return mbLastCol; };
-sal_Bool& isBandRow(){ return mbBandRow; };
-sal_Bool& isBandCol(){ return mbBandCol; };
-
-void apply( const TablePropertiesPtr& );
-void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
-const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & xPropSet,
::oox::drawingml::TextListStylePtr pMasterTextListStyle );
-
-private:
-
-const TableStyle& getUsedTableStyle( const
::oox::core::XmlFilterBase& rFilterBase, sal_Bool &isCreateTabStyle);
-
-rtl::OUString maStyleId; // either
StyleId is available
-boost::shared_ptr< TableStyle > mpTableStyle; // or the
complete TableStyle
-std::vector< sal_Int32 >mvTableGrid;
-std::vector< TableRow > mvTableRows;
-
-sal_BoolmbRtl;
-sal_BoolmbFirstRow;
-sal_BoolmbFirstCol;
-sal_BoolmbLastRow;
-sal_BoolmbLastCol;
-sal_BoolmbBandRow;
-sal_BoolmbBandCol;
-};
-
-} } }
-
-#endif // OOX_DRAWINGML_TABLEPROPERTIES_HXX
commit f39f7ba614749d99362a2059919521eee6bdb6fc
Author: Zhe Wang
Date: Fri Sep 7 03:49:09 2012 +
Fix issue #i120723#: Table style is lost when import PPTX by AOO
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx
* subversion/main/oox/source/drawingml/table/tableproperties.cxx
[]if the imported table in pptx just have tableStyleId, should fill the
tablestyle's content.
Patch by: Ma Bingbing
Suggested by: Wang Zhe
Found by:Ma Bingbing
Review by: Wang Zhe (cherry picked from commit
74b1435a4d39eac71e36fb1c387b24af4b353fa0)
Conflicts:
oox/inc/oox/drawingml/table/tableproperties.hxx
oox/source/drawingml/table/tableproperties.cxx
Change-Id: I554169522a95343662781
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 74/b1435a4d39eac71e36fb1c387b24af4b353fa0
74/b1435a4d39eac71e36fb1c387b24af4b353fa0 |1 + 1 file changed, 1 insertion(+) New commits: commit fd367180504a02dc071e21a85678f7839fed373e Author: Xisco Fauli Date: Mon Jun 3 00:20:15 2013 +0200 Notes added by 'git notes add' diff --git a/74/b1435a4d39eac71e36fb1c387b24af4b353fa0 b/74/b1435a4d39eac71e36fb1c387b24af4b353fa0 new file mode 100644 index 000..30aca3b --- /dev/null +++ b/74/b1435a4d39eac71e36fb1c387b24af4b353fa0 @@ -0,0 +1 @@ +merged as: f39f7ba614749d99362a2059919521eee6bdb6fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 11/fda1bd134b07c5bcaca6186d63107ec9f47b98
11/fda1bd134b07c5bcaca6186d63107ec9f47b98 |1 + 1 file changed, 1 insertion(+) New commits: commit e9f3d4cccf196bd54cbc9e20635c3d4c2f201836 Author: Xisco Fauli Date: Mon Jun 3 00:55:39 2013 +0200 Notes added by 'git notes add' diff --git a/11/fda1bd134b07c5bcaca6186d63107ec9f47b98 b/11/fda1bd134b07c5bcaca6186d63107ec9f47b98 new file mode 100644 index 000..0d1e832 --- /dev/null +++ b/11/fda1bd134b07c5bcaca6186d63107ec9f47b98 @@ -0,0 +1 @@ +merged as: 5f0c969f43538e8a92ed37c27fab228d97b1bebe ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/4848490cb5465c873c3912badcf330416afb35
53/4848490cb5465c873c3912badcf330416afb35 |1 + 1 file changed, 1 insertion(+) New commits: commit 6c91c9b975125096276cd65410a9743e4445ab0f Author: Xisco Fauli Date: Sat Apr 13 23:16:26 2013 +0200 Notes added by 'git notes add' diff --git a/53/4848490cb5465c873c3912badcf330416afb35 b/53/4848490cb5465c873c3912badcf330416afb35 new file mode 100644 index 000..c410ce0 --- /dev/null +++ b/53/4848490cb5465c873c3912badcf330416afb35 @@ -0,0 +1 @@ +ignore: adds a new interface extending an already existing one ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/446076e684a0d0de448366ab927531e3b54bba
37/446076e684a0d0de448366ab927531e3b54bba |1 + 1 file changed, 1 insertion(+) New commits: commit ff97fecfc0d6c6fad7d3111d94b3ba814419e05e Author: Xisco Fauli Date: Sun Apr 14 17:56:41 2013 +0200 Notes added by 'git notes add' diff --git a/37/446076e684a0d0de448366ab927531e3b54bba b/37/446076e684a0d0de448366ab927531e3b54bba new file mode 100644 index 000..08bcce5 --- /dev/null +++ b/37/446076e684a0d0de448366ab927531e3b54bba @@ -0,0 +1 @@ +merged as: f75ca1fdad1094fbea4bb6cb0e3cc9458700c470 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/895f45df5c23fd8e714ba7e73fba463a97452d
0e/895f45df5c23fd8e714ba7e73fba463a97452d |1 + 1 file changed, 1 insertion(+) New commits: commit b9dc14806b92b1614017b4d4f632b1acb3acf8e4 Author: Xisco Fauli Date: Sun Apr 14 17:58:11 2013 +0200 Notes added by 'git notes add' diff --git a/0e/895f45df5c23fd8e714ba7e73fba463a97452d b/0e/895f45df5c23fd8e714ba7e73fba463a97452d new file mode 100644 index 000..8d08b00 --- /dev/null +++ b/0e/895f45df5c23fd8e714ba7e73fba463a97452d @@ -0,0 +1 @@ +merged as: bc589d57f083279b6d619904b937fae706ece493 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e2/9639ac11dae30edb3cd1265b8cd945dbdf0536
e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 |1 + 1 file changed, 1 insertion(+) New commits: commit b5d6fa2340b37ad8d22ba84eaa8d86282e91269a Author: Xisco Fauli Date: Sun Apr 14 18:00:33 2013 +0200 Notes added by 'git notes add' diff --git a/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 b/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 new file mode 100644 index 000..077f233 --- /dev/null +++ b/e2/9639ac11dae30edb3cd1265b8cd945dbdf0536 @@ -0,0 +1 @@ +merged as: 5bdba378d6fc9f18f618967ec37d07efed2afee4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 75/c944eef99cfa3323b411a6e5e892cbf5aa84cc
75/c944eef99cfa3323b411a6e5e892cbf5aa84cc |1 + 1 file changed, 1 insertion(+) New commits: commit d88ff5699b153802f456c5dba27f1faae32ae502 Author: Xisco Fauli Date: Sun Apr 14 18:02:04 2013 +0200 Notes added by 'git notes add' diff --git a/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc b/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc new file mode 100644 index 000..a0ed5f4 --- /dev/null +++ b/75/c944eef99cfa3323b411a6e5e892cbf5aa84cc @@ -0,0 +1 @@ +merged as: 4e07258cbd1f4fb16d6ce2174fb5c74c3b36da33 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e4/b509ed7e67cdd38201d26e864c3a5a7620d911
e4/b509ed7e67cdd38201d26e864c3a5a7620d911 |1 + 1 file changed, 1 insertion(+) New commits: commit b73c92aaf2c3cc525347ceca9c89884880ba3349 Author: Xisco Fauli Date: Sun Apr 14 18:03:52 2013 +0200 Notes added by 'git notes add' diff --git a/e4/b509ed7e67cdd38201d26e864c3a5a7620d911 b/e4/b509ed7e67cdd38201d26e864c3a5a7620d911 new file mode 100644 index 000..672b7c6 --- /dev/null +++ b/e4/b509ed7e67cdd38201d26e864c3a5a7620d911 @@ -0,0 +1 @@ +merged as: 0efd28738af121097dcc186dab85dd65c88a0b7b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source filter/source
editeng/source/outliner/outliner.cxx | 10 --
filter/source/msfilter/svdfppt.cxx | 22 +++---
2 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 17aa2d99a0537f230aa1bc7f0df40937462441eb
Author: Xisco Fauli
Date: Thu May 9 21:06:40 2013 +0200
Related: #119477#, nBuStart is initialized as -1, an unsigned int is
required
Otherwise 65536 will be printed as the firt bullet
Change-Id: Ie200c1c67a9b73321990a55940115ae30b9e7c37
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index c7cd534..d8fa17d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2207,7 +2207,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj*
rOutliner.SetStyleSheet( 0, pSheet );
}
rOutliner.SetVertical( pTextObj->GetVertical() );
-sal_Int16 nLastStartNumbering = -1;
const PPTParagraphObj* pPreviousParagraph = NULL;
for ( PPTParagraphObj* pPara = pTextObj->First(); pPara; pPara =
pTextObj->Next() )
{
@@ -2303,7 +2302,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj*
if ( !nIsBullet2 )
aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE,
sal_False ) );
-
pPreviousParagraph = pPara;
if ( !aSelection.nStartPos )// in PPT empty paragraphs
never gets a bullet
{
@@ -3582,7 +3580,7 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat(
SdrPowerPointImport& rM
sal_Int16 nBuStart = *rStartNumbering;
//The Seventh bit of nBuFlags that specifies whether
fBulletHasAutoNumber exists,
//and fBulletHasAutoNumber that specifies whether this paragraph has
an automatic numbering scheme.
-if ( ( nBuFlags & 0x0200 ) && ( nBuStart != 1 ))
+if ( ( nBuFlags & 0x0200 ) && ( nBuStart != -1 ))
{
rNumberFormat.SetStart( static_cast(nBuStart) );
}
commit 3ba0e7ad7ad1c85a87acbef354fb423470472017
Author: Sun Ying
Date: Wed Sep 19 07:09:20 2012 +
#119477# fix bullet's start with error when save .ppt file
Reported by: Liu Ping Tan
Patch by: Ying Sun
Review by: Steve Yin.
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 8029501..c28ca80 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1888,10 +1888,16 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16
nPara, const SvxNumberFormat*
if( pFmt == 0 )
continue; // ignore paragraphs without bullets
-// check if numbering is the same
-if( !isSameNumbering( *pFmt, *pParaFmt ) )
+// check if numbering less than or equal to pParaFmt
+if( !isSameNumbering( *pFmt, *pParaFmt ) || ( pFmt->GetStart() <
pParaFmt->GetStart() ) )
break;
+if ( pFmt->GetStart() > pParaFmt->GetStart() )
+{
+ nNumber += pFmt->GetStart() - pParaFmt->GetStart();
+ pParaFmt = pFmt;
+}
+
const SfxBoolItem& rBulletState = (const SfxBoolItem&)
pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE );
if( rBulletState.GetValue() )
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 1914c55..c7cd534 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2303,19 +2303,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj(
PPTTextObj* pTextObj, SdrTextObj*
if ( !nIsBullet2 )
aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE,
sal_False ) );
-if ( oStartNumbering )
-{
-if ( *oStartNumbering != nLastStartNumbering )
-rOutliner.SetNumberingStartValue( nParaIndex,
*oStartNumbering );
-else
-rOutliner.SetNumberingStartValue( nParaIndex, -1 );
-nLastStartNumbering = *oStartNumbering;
-}
-else
-{
-nLastStartNumbering = -1;
-rOutliner.SetNumberingStartValue( nParaIndex,
nLastStartNumbering );
-}
pPreviousParagraph = pPara;
if ( !aSelection.nStartPos )// in PPT empty paragraphs
never gets a bullet
@@ -3592,6 +3579,13 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat(
SdrPowerPointImport& rM
break;
}
rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
+sal_Int16 nBuStart = *rStartNumbering;
+//The Seventh bit of nBuFlags that specifies whether
fBulletHasAutoNumber exists
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 97/2b0353add1d0499ac746fd095eed0bc7425eb4
97/2b0353add1d0499ac746fd095eed0bc7425eb4 |1 + 1 file changed, 1 insertion(+) New commits: commit 3665baae2ac6c6cfc899972c09ba94e6a3b5cb52 Author: Xisco Fauli Date: Sat May 11 13:34:49 2013 +0200 Notes added by 'git notes add' diff --git a/97/2b0353add1d0499ac746fd095eed0bc7425eb4 b/97/2b0353add1d0499ac746fd095eed0bc7425eb4 new file mode 100644 index 000..01cac0a --- /dev/null +++ b/97/2b0353add1d0499ac746fd095eed0bc7425eb4 @@ -0,0 +1 @@ +merged as: 3ba0e7ad7ad1c85a87acbef354fb423470472017 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 71/dec2405c57cff2c9f09b8c22ee97a41238addd
71/dec2405c57cff2c9f09b8c22ee97a41238addd |1 + 1 file changed, 1 insertion(+) New commits: commit e08fa846fff7ad11ea6dcbb1f31ed3343ef09eed Author: Xisco Fauli Date: Wed May 15 20:45:06 2013 +0200 Notes added by 'git notes add' diff --git a/71/dec2405c57cff2c9f09b8c22ee97a41238addd b/71/dec2405c57cff2c9f09b8c22ee97a41238addd new file mode 100644 index 000..f4001d6 --- /dev/null +++ b/71/dec2405c57cff2c9f09b8c22ee97a41238addd @@ -0,0 +1 @@ +merged as: e1ea6774f2402dec2433233b4821f0c9f2177628 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/ww8/ww8par6.cxx | 31 +++
1 file changed, 31 insertions(+)
New commits:
commit bc2fe616febbaccb3cda16f66101d393e91232cd
Author: Xisco Fauli
Date: Thu May 16 01:38:17 2013 +0200
Wae: unused variable
Change-Id: I1025bb9766d6d6aad2d60467a72a15d3a3af97d4
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d852358..0d9a638 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3952,7 +3952,6 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const
sal_uInt8* pData, short nLe
{
if (!lcl_HasExplicitLeft(pPlcxMan, bVer67))
{
-int tmp = pNumFmt->GetIndentAt();
aLR.SetTxtLeft(pNumFmt->GetIndentAt());
// If have not explicit left, set number format
list tab position is doc default tab
commit b858429f2495fceb820de20815318cff8882ed78
Author: Lei De Bin
Date: Wed Aug 29 04:44:52 2012 +
Related:#119576# fix indent and spacing between bullets and text
they are inconsistent with MS word
Reported by: Yan Ji
Patch by: Lei De Bin
Review by: Chen Zuo Jun
Conflicts:
sw/source/filter/ww8/ww8par6.cxx
Change-Id: I48a6761a8e8fb1c052aa4f2a261aefb850d6c112
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 78733af..d852358 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3822,6 +3822,18 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const
sal_uInt8* pData, short
NewAttr( aLN );
}
+bool lcl_HasExplicitLeft(const WW8PLCFMan *pPlcxMan, bool bVer67)
+{
+WW8PLCFx_Cp_FKP *pPap = pPlcxMan ? pPlcxMan->GetPapPLCF() : 0;
+if (pPap)
+{
+if (bVer67)
+return pPap->HasSprm(17);
+else
+return (pPap->HasSprm(0x840F) || pPap->HasSprm(0x845E));
+}
+return false;
+}
// Sprm 16, 17
void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short
nLen )
{
@@ -3931,6 +3943,26 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const
sal_uInt8* pData, short nLe
}
aLR.SetTxtFirstLineOfst(nPara);
+
+if (!pAktColl)
+{
+if (const SwTxtNode* pNode = pPaM->GetNode()->GetTxtNode())
+{
+if ( const SwNumFmt *pNumFmt =
GetNumFmtFromTxtNode(*pNode) )
+{
+if (!lcl_HasExplicitLeft(pPlcxMan, bVer67))
+{
+int tmp = pNumFmt->GetIndentAt();
+aLR.SetTxtLeft(pNumFmt->GetIndentAt());
+
+// If have not explicit left, set number format
list tab position is doc default tab
+const SvxTabStopItem *pDefaultStopItem = (const
SvxTabStopItem *)rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP);
+if ( pDefaultStopItem &&
pDefaultStopItem->Count() > 0 )
+((SwNumFmt*)(pNumFmt))->SetListtabPos(
((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() );
+}
+}
+}
+}
if (pAktColl && nAktColl < vColl.size())
{
vColl[nAktColl].bListReleventIndentSet = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
