[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/unocore/unotext.cxx |4 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx |8 +++-
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit f3a91be5fcdcb70ea64fc439d2b2aa4e6a19e421
Author: Miklos Vajna vmik...@frugalware.org
Date: Sun Feb 5 14:46:25 2012 +0100
SwXText::convertToTextFrame: pSartTableNode - pStartTableNode
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index db82b18..00c7e09 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1603,8 +1603,8 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
// remove the addtional paragraphs in the end
if (pStartStartNode-GetStartNodeType() == SwTableBoxStartNode)
{
-SwTableNode *const
pSartTableNode(pStartStartNode-FindTableNode());
-const SwNodeIndex aTblIdx( *pSartTableNode, -1 );
+SwTableNode *const
pStartTableNode(pStartStartNode-FindTableNode());
+const SwNodeIndex aTblIdx( *pStartTableNode, -1 );
SwPosition aBefore(aTblIdx);
bParaBeforeInserted = GetDoc()-AppendTxtNode( aBefore );
aStartPam.DeleteMark();
commit 7b2ba001768b5edbdd738a2a38508c0a30ab1838
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Feb 7 09:33:29 2012 +0100
RtfAttributeOutput: use the new SfxItemSet::HasItem()
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 8ae42ed..66048cc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -648,7 +648,7 @@ void RtfAttributeOutput::TableDefaultBorders(
ww8::WW8TableNodeInfoInner::Pointe
SwWriteTableCell *pCell = pRow-GetCells( )[
pTableTextNodeInfoInner-getCell( ) ];
const SwFrmFmt *pCellFmt = pCell-GetBox()-GetFrmFmt();
const SfxPoolItem* pItem;
-if (SFX_ITEM_SET == pCellFmt-GetAttrSet().GetItemState(RES_BOX, sal_True,
pItem))
+if (pCellFmt-GetAttrSet().HasItem(RES_BOX, pItem))
{
const SvxBoxItem rBox = (SvxBoxItem)*pItem;
static const sal_uInt16 aBorders[] =
@@ -694,8 +694,7 @@ void RtfAttributeOutput::TableBackgrounds(
ww8::WW8TableNodeInfoInner::Pointer_t
SwWriteTableCell *pCell = pRow-GetCells( )[
pTableTextNodeInfoInner-getCell( ) ];
const SwFrmFmt *pCellFmt = pCell-GetBox()-GetFrmFmt();
const SfxPoolItem* pItem;
-if( SFX_ITEM_SET == pCellFmt-GetAttrSet().GetItemState(
-RES_BACKGROUND, sal_True, pItem ))
+if (pCellFmt-GetAttrSet().HasItem(RES_BACKGROUND, pItem))
{
const SvxBrushItem rBack = (SvxBrushItem)*pItem;
if( !rBack.GetColor().GetTransparency() )
@@ -778,8 +777,7 @@ void RtfAttributeOutput::TableVerticalCell(
ww8::WW8TableNodeInfoInner::Pointer_
m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVMRG);
// vertical alignment
-if( SFX_ITEM_SET == pCellFmt-GetAttrSet().GetItemState(
-RES_VERT_ORIENT, sal_True, pItem ) )
+if (pCellFmt-GetAttrSet().HasItem(RES_VERT_ORIENT, pItem))
switch( ((SwFmtVertOrient*)pItem)-GetVertOrient() )
{
case text::VertOrientation::CENTER:
m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVERTALC); break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/callform.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cbccd5b5050ec8a1f4ee6532e71a6a245db6da2e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 7 11:33:56 2012 +0100
Namespace scope fix
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index ab0b8fc..949e642 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -163,8 +163,6 @@ public:
ModuleCollection aModuleCollection;
-}
-
const ModuleData* ModuleCollection::findByName(const rtl::OUString rName)
const
{
MapType::const_iterator it = maData.find(rName);
@@ -185,6 +183,8 @@ void ModuleCollection::clear()
maData.clear();
}
+}
+
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
bool InitExternalFunc(const rtl::OUString rModuleName)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/undo/undobj.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit de998662158e3654ac14469989d27ce963cce935
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 6 22:01:27 2012 +0100
fdo#38745: fix hilariously stupid stack guards:
The UndoRedoRedlineGuards that SwUndo::{Un,Re}doWithContext wants to
put on the stack aren't actually variables, so the destructor gets
invoked before the function call that the guard is supposed to protect.
Regression from CWS undoapi.
(cherry picked from commit 13424b43c25389e303774c3fb2f2beb3e20ceae5)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index f815398..b2a5243 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -249,7 +249,7 @@ void SwUndo::UndoWithContext(SfxUndoContext rContext)
dynamic_cast ::sw::UndoRedoContext * ( rContext));
OSL_ASSERT(pContext);
if (!pContext) { return; }
-UndoRedoRedlineGuard(*pContext, *this);
+UndoRedoRedlineGuard const g(*pContext, *this);
UndoImpl(*pContext);
}
@@ -259,7 +259,7 @@ void SwUndo::RedoWithContext(SfxUndoContext rContext)
dynamic_cast ::sw::UndoRedoContext * ( rContext));
OSL_ASSERT(pContext);
if (!pContext) { return; }
-UndoRedoRedlineGuard(*pContext, *this);
+UndoRedoRedlineGuard const g(*pContext, *this);
RedoImpl(*pContext);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 06c62190b2c28720294a603d26878c2cb0b35b9c
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Feb 6 10:58:12 2012 +0100
n#228839 an empty table grid can't have implicit merges
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 31d46bd..2331e57 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -477,7 +477,7 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
-else if (m_bImplicitMerges)
+else if (m_bImplicitMerges pTableGrid-size())
{
// More grid than cells definitions? Then take the last ones.
// This feature is used by the RTF implicit horizontal cell merges.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/helpmerge.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b20c766ff6f9af8925bf5dad4879f9065368a0b1 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 7 14:40:43 2012 +0100 Freed l10ntools from tools/string; Windows redux diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index ff1c7c7..431c60b 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -437,7 +437,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile #if defined(UNX) rc = rename( sTempFile.getStr() , sTargetFile.getStr() ); #else -rc = MoveFileEx( sTempFile.GetBuffer() , sTargetFile.GetBuffer(), MOVEFILE_REPLACE_EXISTING ); +rc = MoveFileEx( sTempFile.getStr() , sTargetFile.getStr(), MOVEFILE_REPLACE_EXISTING ); #endif FileStat aFS( aTar ); @@ -463,7 +463,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile #if defined(UNX) rc = rename( sTempFileCopy.getStr() , sTargetFile.getStr() ); #else -rc = MoveFileEx( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() , MOVEFILE_REPLACE_EXISTING ); +rc = MoveFileEx( sTempFileCopy.getStr() , sTargetFile.getStr() , MOVEFILE_REPLACE_EXISTING ); #endif aFS.Update( aTar ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile
Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9045503c46818bacc2a13b1db65e709633e7c6cb Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 7 14:55:19 2012 +0100 soffice.sh is no longer generated at configure time diff --git a/Makefile b/Makefile index 3eeb510..08054d5 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,7 @@ ifeq ($(BUILD_DMAKE),YES) endif rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \ bin/repo-list config.log config.status configure \ - desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ + ooo.lst post_download post_download.log \ config_host.mk.last set_soenv.stamp src.downloaded warn # ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: post.Makefile
post.Makefile |7 +++ 1 file changed, 7 insertions(+) New commits: commit 5ed6b310c6721c001293f2dd058cdfaec09e8024 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Feb 7 09:07:32 2012 -0600 oops forgot a file diff --git a/post.Makefile b/post.Makefile new file mode 100644 index 000..bfa8b34 --- /dev/null +++ b/post.Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk +$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source
scp2/source/xsltfilter/module_xsltfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3654d261f25a46b908aa7a927699456a606e3eb3 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Feb 2 11:42:01 2012 +0100 Chose xslt filters for default install, not for minimal though Signed-off-by: Andras Timar ati...@suse.com diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7854ce7..a3206b0 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Table, gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; -Default = NO; +Default = YES; Styles = ( ); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/inputwin.cxx | 17 +
sc/source/ui/inc/inputwin.hxx |4
2 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 09d7b5e6039827d0f02f424370f929caff179ac9
Author: Noel Power noel.po...@novell.com
Date: Tue Feb 7 15:36:29 2012 +
make ctrl-shift-f2 change focus to the inputline fdo#40957
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 3771d37..ebdea66 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -697,7 +697,7 @@ void ScInputWindow::StopEditEngine( sal_Bool bAll )
void ScInputWindow::TextGrabFocus()
{
-aTextWindow.GrabFocus();
+aTextWindow.TextGrabFocus();
}
void ScInputWindow::TextInvalidate()
@@ -712,12 +712,13 @@ void ScInputWindow::SwitchToTextWin()
aTextWindow.StartEditEngine();
if ( SC_MOD()-IsEditMode() )
{
-aTextWindow.GrabFocus();
+aTextWindow.TextGrabFocus();
EditView* pView = aTextWindow.GetEditView();
if (pView)
{
-xub_StrLen nLen = pView-GetEditEngine()-GetTextLen(0);
-ESelection aSel( 0, nLen, 0, nLen );
+sal_uInt16 nPara = pView-GetEditEngine()-GetParagraphCount() ?
( pView-GetEditEngine()-GetParagraphCount() - 1 ) : 0;
+xub_StrLen nLen = pView-GetEditEngine()-GetTextLen( nPara );
+ESelection aSel( nPara, nLen, nPara, nLen );
pView-SetSelection( aSel );// set cursor to end
of text
}
}
@@ -1115,6 +1116,10 @@ IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*,
EMPTYARG )
return 0;
}
+void ScInputBarGroup::TextGrabFocus()
+{
+aMultiTextWnd.TextGrabFocus();
+}
//
// ScMultiTextWnd
@@ -2022,6 +2027,10 @@ void ScTextWnd::DataChanged( const DataChangedEvent
rDCEvt )
Window::DataChanged( rDCEvt );
}
+void ScTextWnd::TextGrabFocus()
+{
+GrabFocus();
+}
//
// Positionsfenster
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 185ac45..b0facf1 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -65,6 +65,7 @@ public:
virtual voidMakeDialogEditView() = 0;
virtual voidSetFormulaMode( sal_Bool bSet ) = 0;
virtual sal_BoolIsInputActive() = 0;
+virtual voidTextGrabFocus() = 0;
};
class ScTextWnd : public ScTextWndBase, public DragSourceHelper // edit
window
@@ -85,6 +86,8 @@ public:
virtual voidStartEditEngine();
virtual voidStopEditEngine( sal_Bool bAll );
+virtual voidTextGrabFocus();
+
virtual voidDataChanged( const DataChangedEvent rDCEvt );
virtual voidSetFormulaMode( sal_Bool bSet );
@@ -225,6 +228,7 @@ public:
virtual voidResize();
virtual const String GetTextString() const;
virtual voidStopEditEngine( sal_Bool bAll );
+virtual voidTextGrabFocus();
voidInitEditEngine(SfxObjectShell* pObjSh);
voidSetFormulaMode( sal_Bool bSet );
boolIsFocus();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/Library_rtftok.mk writerfilter/source
writerfilter/Library_rtftok.mk |1 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 25 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx |7 +++
3 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 66fa759bb6d8199404b482512d7609ba47265ae8
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Feb 7 16:56:27 2012 +0100
n#192129 fix RTF import of PNG images with bogus width/height
For example Apache FOP generates RTF output where the \picw and \pich
values are even negative, SvxRTFParser::ReadBmpData() used the same
trick to solve the issue.
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 3835a5d..1afdd27 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,rtftok,\
cppuhelper \
oox \
sal \
+ svt \
ucbhelper \
utl \
tl \
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a2d44dd..4f6cde5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -41,6 +41,10 @@
#include unotools/ucbstreamhelper.hxx
#include unotools/streamwrap.hxx
#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include rtl/oustringostreaminserter.hxx
+#include vcl/graph.hxx
+#include svtools/grfmgr.hxx
+#include vcl/svapp.hxx
#include doctok/sprmids.hxx // NS_sprm namespace
#include doctok/resourceids.hxx // NS_rtf namespace
@@ -582,6 +586,20 @@ int RTFDocumentImpl::resolvePict(bool bInline)
aExtHeader.yExt = m_aStates.top().aPicture.nHeight;
OUString aGraphicUrl = m_pGraphicHelper-importGraphicObject(xInputStream,
aExtHeader);
+if (m_aStates.top().aPicture.nStyle == BMPSTYLE_PNG)
+{
+// In case of PNG, the real size is known, don't use the values
+// provided by picw and pich.
+OString aURLBS(OUStringToOString(aGraphicUrl, RTL_TEXTENCODING_UTF8));
+const char aURLBegin[] = vnd.sun.star.GraphicObject:;
+Graphic aGraphic =
GraphicObject(aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin))).GetTransformedGraphic();
+Size aSize(aGraphic.GetPrefSize());
+MapMode aMap(MAP_100TH_MM);
+aSize = Application::GetDefaultDevice()-PixelToLogic( aSize, aMap );
+m_aStates.top().aPicture.nWidth = aSize.Width();
+m_aStates.top().aPicture.nHeight = aSize.Height();
+}
+
// Wrap it in an XShape.
uno::Referencedrawing::XShape xShape;
OUString
aService(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.GraphicObjectShape));
@@ -1920,6 +1938,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_FORMSHADE:
// Noop, this is the default in Writer.
break;
+case RTF_PNGBLIP:
+m_aStates.top().aPicture.nStyle = BMPSTYLE_PNG;
+break;
case RTF_POSYT: m_aStates.top().aFrame.nVertAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top; break;
case RTF_POSYB: m_aStates.top().aFrame.nVertAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom; break;
case RTF_POSYC: m_aStates.top().aFrame.nVertAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center; break;
@@ -1939,6 +1960,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_POSXO: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_outside; break;
case RTF_POSXL: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left; break;
case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
+
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle flag '
lcl_RtfToString(nKeyword) ');
aSkip.setParsed(false);
@@ -3318,7 +3340,8 @@ RTFPicture::RTFPicture()
nCropB(0),
nCropL(0),
nCropR(0),
-eWMetafile(0)
+eWMetafile(0),
+nStyle(BMPSTYLE_NONE)
{
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 12d414c..90ecc98 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -150,6 +150,12 @@ namespace writerfilter {
FORMFIELD_LIST
};
+enum RTFBmpStyles
+{
+BMPSTYLE_NONE,
+BMPSTYLE_PNG
+};
+
/// A buffer storing dmapper calls.
typedef std::deque std::pairRTFBufferTypes, RTFValue::Pointer_t
RTFBuffer_t;
@@ -184,6 +190,7 @@ namespace writerfilter {
sal_uInt16 nScaleX, nScaleY;
short nCropT, nCropB, nCropL, nCropR;
sal_uInt16 eWMetafile;
+RTFBmpStyles nStyle;
};
/// Stores the
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - officecfg/registry sc/source xmloff/inc xmloff/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |2 -
sc/source/filter/xml/xmlstyle.cxx|4 +-
xmloff/inc/xmloff/txtparae.hxx |3 +
xmloff/source/draw/sdpropls.cxx | 23 +++
xmloff/source/text/txtparae.cxx | 30 ---
5 files changed, 51 insertions(+), 11 deletions(-)
New commits:
commit dae8fff9289edbfda3317bd19acd233400528a95
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 2 12:44:03 2012 +0100
fdo#45534: ODF export: fix draw:fit-to-size
In ODF 1.1 and 1.2 this attribute is of type boolean, so only write the
new values if the extended format is selected.
(regression introduced with e479f47f7d48dbd0d701bf347b6a2d5121ba3d34)
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 88ffa2e..c5f77e5 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -619,6 +619,15 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
+SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] =
+{
+{ XML_FALSE,drawing::TextFitToSizeType_NONE },
+{ XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
+{ XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
+{ XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
+{ XML_TOKEN_INVALID, 0 }
+};
+
SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
{
{ XML_FALSE,drawing::TextFitToSizeType_NONE },
@@ -1047,7 +1056,19 @@ const XMLPropertyHandler*
XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum,
::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) );
break;
case XML_SD_TYPE_FITTOSIZE:
-pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum,
::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) );
+{
+if (mpExport (mpExport-getDefaultVersion()
+= SvtSaveOptions::ODFVER_012))
+{
+pHdl = new
XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+else
+{
+pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+}
break;
case XML_SD_TYPE_MEASURE_UNIT:
pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum,
::getCppuType((const sal_Int32*)0) );
commit c6bf0fdf82c9ba0626ea6356923d293820e75565
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 1 21:32:14 2012 +0100
fdo#45450: sc: ODF export: cell styles:
Only write style:vertical-justify and css3t:text-justify in ODF
extended mode.
(regression from 7da57d17b6179e71c8b6d7549ad89eaf3a4a28c6)
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index 0e91a0d..7956c6f 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -90,7 +90,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
MAP( HoriJustify, XML_NAMESPACE_FO, XML_TEXT_ALIGN,
XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY|MID_FLAG_MERGE_PROPERTY, 0 ),
MAP( HoriJustify, XML_NAMESPACE_STYLE, XML_TEXT_ALIGN_SOURCE,
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYSOURCE|MID_FLAG_MERGE_PROPERTY,
0 ),
MAP( HoriJustify, XML_NAMESPACE_STYLE, XML_REPEAT_CONTENT,
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYREPEAT|MID_FLAG_MERGE_PROPERTY,
0 ),
-MAP( SC_UNONAME_CELLHJUS_METHOD, XML_NAMESPACE_CSS3TEXT, XML_TEXT_JUSTIFY,
XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY_METHOD, 0 ),
+MAP_EXT( SC_UNONAME_CELLHJUS_METHOD, XML_NAMESPACE_CSS3TEXT,
XML_TEXT_JUSTIFY, XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY_METHOD, 0 ),
MAP( IsCellBackgroundTransparent, XML_NAMESPACE_FO,
XML_BACKGROUND_COLOR,
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
0 ),
MAP( IsTextWrapped, XML_NAMESPACE_FO, XML_WRAP_OPTION,
XML_TYPE_PROP_TABLE_CELL|XML_SC_ISTEXTWRAPPED, 0 ),
MAP( LeftBorder, XML_NAMESPACE_FO, XML_BORDER,
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_ALLBORDER ),
@@ -117,7 +117,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
MAP( UserDefinedAttributes, XML_NAMESPACE_TEXT, XML_XMLNS,
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM,
0 ),
MAP( ValidationXML, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION,
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
MAP(
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - xmloff/inc xmloff/source
xmloff/inc/xmloff/txtparae.hxx |3 ++-
xmloff/source/draw/sdpropls.cxx | 23 ++-
xmloff/source/text/txtparae.cxx | 30 --
3 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit 2fb5f7cf09f33b7ae924b07dac45bf3e698da90c
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 7 10:54:04 2012 +
fdo#45534: ODF export: fix draw:fit-to-size
In ODF 1.1 and 1.2 this attribute is of type boolean, so only write the
new values if the extended format is selected.
(regression introduced with e479f47f7d48dbd0d701bf347b6a2d5121ba3d34)
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index a87690d..4df1b01 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -619,6 +619,15 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
+SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] =
+{
+{ XML_FALSE,drawing::TextFitToSizeType_NONE },
+{ XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
+{ XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
+{ XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
+{ XML_TOKEN_INVALID, 0 }
+};
+
SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
{
{ XML_FALSE, drawing::TextFitToSizeType_NONE },
@@ -1047,7 +1056,19 @@ const XMLPropertyHandler*
XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum,
::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) );
break;
case XML_SD_TYPE_FITTOSIZE:
-pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum,
::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) );
+{
+if (mpExport (mpExport-getDefaultVersion()
+= SvtSaveOptions::ODFVER_012))
+{
+pHdl = new
XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+else
+{
+pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum,
+::getCppuType(static_castconst
com::sun::star::drawing::TextFitToSizeType*(0)));
+}
+}
break;
case XML_SD_TYPE_MEASURE_UNIT:
pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum,
::getCppuType((const sal_Int32*)0) );
commit eb7c38705c03b12770d1d964f6e15c1d12719cc4
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 7 10:48:59 2012 +
fdo#45449: ODF export: frames: invalid min-width
XMLTextParagraphExport::addTextFrameAttributes: delay writing of the
fo:min-width and fo:min-height attributes so that they end up at the
draw:text-box element, and not at draw:frame where they are invalid.
Testing reveals that the ODF import can already handle reading the
attributes from the draw:text-box elements, so there doesn't seem to be
a backward compatibility problem.
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index dcb2d6f..dbe865e 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -266,7 +266,8 @@ protected:
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rPropSet,
sal_Bool bShape,
-::rtl::OUString *pMinHeightValue = 0 );
+::rtl::OUString *pMinHeightValue = 0,
+::rtl::OUString *pMinWidthValue = 0 );
virtual void exportStyleAttributes(
const ::com::sun::star::uno::Reference
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index d5962ec..066266d 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2479,7 +2479,8 @@ sal_Bool lcl_txtpara_isBoundAsChar(
sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
const Reference XPropertySet rPropSet,
sal_Bool bShape,
-OUString *pMinHeightValue )
+OUString *pMinHeightValue,
+OUString *pMinWidthValue)
{
sal_Int32 nShapeFeatures = SEF_DEFAULT;
@@ -2582,8 +2583,13 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
}
GetExport().GetMM100UnitConverter().convertMeasure( sValue, nWidth );
if( SizeType::FIX != nWidthType )
-GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_WIDTH,
- sValue.makeStringAndClear() );
+{
+assert(pMinWidthValue);
+if (pMinWidthValue)
+{
+*pMinWidthValue =
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - sw/qa sw/source
sw/qa/unoapi/knownissues.xcl |3 --- sw/source/ui/uiview/view.cxx |2 +- sw/source/ui/uno/unomod.cxx |7 +++ 3 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 7fcb1bb88d0809c64ac4be2aa95a96a883e55af8 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Sep 12 12:19:54 2011 +0200 fs34b: #i117545# (patch provided by mathias.ba...@oracle.com) Signed-off-by: Noel Power noel.po...@novell.com diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index fd32cc5..ff33fcf 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -748,8 +748,13 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo rInfo, c aOpt.setBrowseMode( bVal ); pView-GetWrtShell().ApplyViewOptions( aOpt ); pView-RecheckBrowseMode(); + +// must be set in mpViewOption as this will overwrite settings in _post! if(mpViewOption) mpViewOption-setBrowseMode(bVal); + +// disable multiple layout +pView-GetDocShell()-ToggleBrowserMode(bVal, pView ); } } break; commit 1f5f826f54684f8f19e69408cffa04cf25b5ad72 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Feb 7 17:15:03 2012 + fdo#35661: fix sw.SwXViewSettings::com::sun::star::text::ViewSettings Signed-off-by: Noel Power noel.po...@novell.com diff --git a/sw/qa/unoapi/knownissues.xcl b/sw/qa/unoapi/knownissues.xcl index 3cea081..a9315fe 100644 --- a/sw/qa/unoapi/knownissues.xcl +++ b/sw/qa/unoapi/knownissues.xcl @@ -188,8 +188,5 @@ sw.SwXTextViewCursor::com::sun::star::view::XScreenCursor ### fd#35660 ### sw.DocumentSettings::com::sun::star::text::PrintSettings -### fd#35661 ### -sw.SwXViewSettings::com::sun::star::text::ViewSettings - ### fd#35662 ### sw.SwXPrintSettings::com::sun::star::text::PrintSettings diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 8139a07..fd32cc5 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -748,6 +748,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo rInfo, c aOpt.setBrowseMode( bVal ); pView-GetWrtShell().ApplyViewOptions( aOpt ); pView-RecheckBrowseMode(); +if(mpViewOption) +mpViewOption-setBrowseMode(bVal); } } break; commit fe3ddc22e24a6815481c16e17cd1050bd91b5fe2 Author: Michael Stahl mst...@redhat.com Date: Wed Feb 1 15:49:16 2012 +0100 fdo#37024: SwView::SwView: fix BROWSE_MODE setting: Apparently there is a check in SwDoc::SetAllUniqueFlyNames so that when frames with certain anchor types are in a document, then SetLoaded() is never called. Checking this flag via IsLoaded() here seems unnecessary. This problem was introduced with ebc5777548dea42ed966a16c66d879b1485bbfb4, from CWS swlayoutrefactoring. Signed-off-by: Noel Power noel.po...@novell.com diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index f6912af..b2c920a 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -835,7 +835,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) if( !bOldShellWasSrcView pWebDShell !bOldShellWasPagePreView ) aUsrPref.setBrowseMode( sal_True ); -else if( rDoc.IsLoaded() ) +else aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) ); //Fuer den BrowseMode wollen wir keinen Factor uebernehmen. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dptabres.hxx | 12 +
sc/source/core/data/dptabres.cxx | 79 ---
2 files changed, 45 insertions(+), 46 deletions(-)
New commits:
commit ece725d7d8fc7d22544785f4e76b28332912ea59
Author: Noel Grandin n...@peralex.com
Date: Tue Feb 7 12:17:27 2012 -0500
Convert dptabres.cxx in SC module from SV_DECL_PTRARR_DEL to std::vector.
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 6864e14..f5c10a2 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -221,8 +221,6 @@ public:
// results for a hierarchy dimension
//
-#define SC_DP_RES_GROW 16
-
class ScDPResultDimension;
class ScDPDataDimension;
class ScDPDataMember;
@@ -494,10 +492,7 @@ public:
ScDPDataDimension* GetChildDimension() { return
pChildDimension; }
};
-//! replace PtrArr with 32-bit array
-
-typedef ScDPDataMember* ScDPDataMemberPtr;
-SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW)
+typedef std::vectorScDPDataMember* ScDPDataMembers;
// result dimension contains only members
@@ -615,7 +610,7 @@ class ScDPDataDimension
private:
const ScDPResultData* pResultData;
const ScDPResultDimension* pResultDimension; // column
-ScDPDataMembers aMembers;
+ScDPDataMembers maMembers;
sal_BoolbIsDataLayout; //! or ptr to IntDimension?
public:
@@ -646,7 +641,8 @@ public:
voidDumpState( const ScDPResultDimension* pRefDim,
ScDocument* pDoc, ScAddress rPos ) const;
longGetMemberCount() const;
-ScDPDataMember* GetMember(long n) const;
+const ScDPDataMember* GetMember(long n) const;
+ScDPDataMember* GetMember(long n);
};
//
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 15fd87b..4f780cd 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -44,6 +44,7 @@
#include datauno.hxx // ScDataUnoConversion
#include document.hxx // for DumpState only!
+#include stlalgorithm.hxx
#include math.h
#include float.h //! Test !!!
@@ -67,10 +68,6 @@ using ::rtl::OUString;
// ---
-SV_IMPL_PTRARR( ScDPDataMembers, ScDPDataMemberPtr );
-
-// ---
-
static sal_uInt16 nFuncStrIds[12] = // passend zum enum ScSubTotalFunc
{
0, // SUBTOTAL_FUNC_NONE
@@ -243,8 +240,8 @@ sal_Bool ScDPRowMembersOrder::operator()( sal_Int32
nIndex1, sal_Int32 nIndex2 )
sal_Bool ScDPColMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2
) const
{
-ScDPDataMember* pDataMember1 = rDimension.GetMember(nIndex1);
-ScDPDataMember* pDataMember2 = rDimension.GetMember(nIndex2);
+const ScDPDataMember* pDataMember1 = rDimension.GetMember(nIndex1);
+const ScDPDataMember* pDataMember2 = rDimension.GetMember(nIndex2);
sal_Bool bHide1 = pDataMember1 !pDataMember1-IsVisible();
sal_Bool bHide2 = pDataMember2 !pDataMember2-IsVisible();
if ( bHide1 || bHide2 )
@@ -2314,7 +2311,7 @@ void ScDPDataMember::UpdateRunningTotals( const
ScDPResultMember* pRefMember,
sal_Bool bRefDimInCol = ( nRefOrient ==
sheet::DataPilotFieldOrientation_COLUMN );
sal_Bool bRefDimInRow = ( nRefOrient ==
sheet::DataPilotFieldOrientation_ROW );
-const ScDPResultDimension* pSelectDim = NULL;
+ScDPResultDimension* pSelectDim = NULL;
long nRowPos = 0;
long nColPos = 0;
@@ -3297,7 +3294,7 @@ ScDPDataMember*
ScDPResultDimension::GetRowReferenceMember( const ScDPRelativePo
const long* pNextColIndex = pColIndexes;
while ( *pNextColIndex = 0 pColMember )
{
-const ScDPDataDimension* pColChild =
pColMember-GetChildDimension();
+ScDPDataDimension* pColChild = pColMember-GetChildDimension();
if ( pColChild *pNextColIndex pColChild-GetMemberCount()
)
pColMember = pColChild-GetMember( *pNextColIndex );
else
@@ -3349,7 +3346,7 @@ ScDPDataMember*
ScDPResultDimension::GetColReferenceMember( const ScDPRelativePo
long nColSkipped = 0;
while ( *pNextColIndex = 0 pColMember nColSkipped nRefDimPos )
{
-const ScDPDataDimension* pColChild =
pColMember-GetChildDimension();
+ScDPDataDimension* pColChild = pColMember-GetChildDimension();
if ( pColChild *pNextColIndex pColChild-GetMemberCount() )
pColMember = pColChild-GetMember( *pNextColIndex );
else
@@ -3363,7 +3360,7 @@
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-ids |8 +++- solenv/bin/create-tags | 11 +-- 2 files changed, 16 insertions(+), 3 deletions(-) New commits: commit 51a3d9c07c73f86455505a074fa01b88fb802852 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Feb 7 12:03:44 2012 -0600 adapt create-tags/create-ids to the absence of set_soenv.in diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 4561fb8..e4d3147 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,13 @@ # create ID file for the whole LibO tree. run it in toplevel dir -. ./config_host.mk +if [ -z $INPATH ] ; then + INPATH=$(grep INPATH= ./config_host.mk | sed -e s/INPATH=//) +fi +if [ -z $INPATH ] ; then +echo could not determine INPATH 2 +exit 1 +fi # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc) if [ $1 = --with-outpath ]; then diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index a2f640c..a61c5b6 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,13 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash + +if [ -z $INPATH ] ; then + INPATH=$(grep INPATH= ./config_host.mk | sed -e s/INPATH=//) +fi +if [ -z $INPATH ] ; then +echo could not determine INPATH 2 +exit 1 +fi -. ./config_host.mk omnicppoptions=--c++-kinds=+p --fields=+iaS --extra=+q ctags -h +.hdl.hrc --langmap=c:+.hdl.hrc.src $omnicppoptions \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
sw/source/core/unocore/unotbl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e078868c290014ddc5eac4a982349ac75557739e
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 18:49:56 2012 +0100
fdo#45115: SwXTextTable: fix setting borders
This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem.
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index 898adef..77cf0af 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -138,7 +138,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine rLine,
SvxBorderLine rSvxLi
{
rSvxLine.SetColor(Color(rLine.Color));
-rSvxLine.GuessLinesWidths(
editeng::SvxBorderStyle(table::BorderLineStyle::SOLID),
+rSvxLine.GuessLinesWidths( editeng::NO_STYLE,
MM100_TO_TWIP( rLine.OuterLineWidth ),
MM100_TO_TWIP( rLine.InnerLineWidth ),
MM100_TO_TWIP( rLine.LineDistance ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/ui/unoobj/cellsuno.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f7adca07343b804efc4e42bed2b4a8d789e58db3
Author: Michael Stahl mst...@redhat.com
Date: Fri Feb 3 21:06:18 2012 +0100
fdo#45115: sc: fix setting borders
Same problem in ScHelperFunctions::GetBorderLine.
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 63ba3ef..4c5c5c5 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -953,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal(
sheet::GeneralFunction eSummary )
const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine(
::editeng::SvxBorderLine rLine, const table::BorderLine rStruct )
{
// Calc needs Twips, and there are 1/100mm in the Uno structure
-rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID )
);
-rLine.GuessLinesWidths( rLine.GetStyle(),
+rLine.GuessLinesWidths( editeng::NO_STYLE,
(sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
(sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
(sal_uInt16)HMMToTwips( rStruct.LineDistance ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/README basic/README configmgr/README connectivity/README desktop/README editeng/README eventattacher/README fileaccess/README formula/README fpicker/README framework/R
avmedia/README|4 basic/README |4 configmgr/README |1 + connectivity/README |1 + desktop/README|1 + editeng/README|6 ++ eventattacher/README |1 + fileaccess/README |1 + formula/README|3 +++ fpicker/README|1 + framework/README |7 +++ idl/README|3 +++ linguistic/README |1 + officecfg/README |4 oovbaapi/README |5 + readlicense_oo/README |1 + scripting/README | 15 --- sfx2/README |6 -- shell/README |1 + svx/README|9 + sysui/README |1 + ucb/README|1 + uui/README|1 + xmlhelp/README|1 + xmloff/README |1 + xmlscript/README |1 + 26 files changed, 72 insertions(+), 9 deletions(-) New commits: commit 64e1ae0f5581bcf8eafecc6c22bcdcb76ac7ba5d Author: Josh Heidenreich josh.sickm...@gmail.com Date: Tue Feb 7 14:17:29 2012 +1030 Added READMEs for modules which used to be in libs-core diff --git a/avmedia/README b/avmedia/README new file mode 100644 index 000..b33f70c --- /dev/null +++ b/avmedia/README @@ -0,0 +1,4 @@ +Audio/Video media implementation. + +Needs a Java Media Framework (JMF). +Not currently usable for streams but only for URIs in the file system. diff --git a/basic/README b/basic/README new file mode 100644 index 000..bed2870 --- /dev/null +++ b/basic/README @@ -0,0 +1,4 @@ +Contains the StarBASIC Interpreter and in addition the GUI of VCLTestTool. + +See also: +[http://wiki.services.openoffice.org/wiki/Basic] diff --git a/configmgr/README b/configmgr/README new file mode 100644 index 000..e63f37c --- /dev/null +++ b/configmgr/README @@ -0,0 +1 @@ +The configuration database - UNO services and some tools. diff --git a/connectivity/README b/connectivity/README new file mode 100644 index 000..852d4f8 --- /dev/null +++ b/connectivity/README @@ -0,0 +1 @@ +Contains database pieces, drivers, etc. diff --git a/desktop/README b/desktop/README new file mode 100644 index 000..75a189a --- /dev/null +++ b/desktop/README @@ -0,0 +1 @@ +What used to be the desktop in StarOffice 5 - now the binary. diff --git a/editeng/README b/editeng/README new file mode 100644 index 000..d2a1a13 --- /dev/null +++ b/editeng/README @@ -0,0 +1,6 @@ +Edit engine. + +In OO.o build DEV300m72 this module was split off from svx but it +has no dependencies on [[svx]] (nor on [[sfx2]]) while in turn svx depends on editeng +Read more in the mailing list post: +[http://www.mail-archive.com/dev@openoffice.org/msg13237.html] diff --git a/eventattacher/README b/eventattacher/README new file mode 100644 index 000..ecfdcf7 --- /dev/null +++ b/eventattacher/README @@ -0,0 +1 @@ +How [[basic]] handles events diff --git a/fileaccess/README b/fileaccess/README new file mode 100644 index 000..113465a --- /dev/null +++ b/fileaccess/README @@ -0,0 +1 @@ +Implements XSimpleFileAccess interface that makes the UCB interfaces actually usable (via UNO) and more intuitive. diff --git a/formula/README b/formula/README new file mode 100644 index 000..da0d528 --- /dev/null +++ b/formula/README @@ -0,0 +1,3 @@ +Contains parts of the formula parser used outside Calc code. + +Has been pulled out from Calc's formula parser code. diff --git a/fpicker/README b/fpicker/README new file mode 100644 index 000..8c09487 --- /dev/null +++ b/fpicker/README @@ -0,0 +1 @@ +Native file pickers for Unix and Windows (file open dialog) GTK+, KDE, Windows. diff --git a/framework/README b/framework/README new file mode 100644 index 000..200c2af --- /dev/null +++ b/framework/README @@ -0,0 +1,7 @@ +UI rewrite, toolbars, menus, UNO stuff, including accelerators and interaction, etc. + +See also: +[http://wiki.services.openoffice.org/wiki/Framework] + +Notable files: +[git:framework/source/services/backingwindow.hxx] Layout of the Startcenter buttons and the corresponding event handler. diff --git a/idl/README b/idl/README new file mode 100644 index 000..38d46bd --- /dev/null +++ b/idl/README @@ -0,0 +1,3 @@ +SvIDL Compiler. + +(CH: Where is the difference to [[idlc]]???) diff --git a/linguistic/README b/linguistic/README new file mode 100644 index 000..39f447c --- /dev/null +++ b/linguistic/README @@ -0,0 +1 @@ +Handles registered modules for spellchecker, hyphenator and thesaurus. diff --git a/officecfg/README b/officecfg/README new file mode 100644 index 000..3a39d28 --- /dev/null +++ b/officecfg/README @@ -0,0 +1,4 @@ +The schema and default settings for the OpenOffice.org configuration database. + +See also: +[[configmgr]] diff --git a/oovbaapi/README b/oovbaapi/README new file mode 100644 index 000..c9d37ea --- /dev/null +++ b/oovbaapi/README @@ -0,0 +1,5 @@ +Module for OpenOffice - VisualBasic interoperability. + +See also:
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/unoidl/unopage.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 6d49075a032191b4f7034b1b8c799d163d35a58c
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Feb 1 18:01:17 2012 +0530
n#735533: Donot set duplicate master slide names.
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 84a76d3..2f441e9 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any rValue ) throw()
}
// XNamed
-void SAL_CALL SdMasterPage::setName( const OUString aName )
+void SAL_CALL SdMasterPage::setName( const OUString rName )
throw(uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString
aName )
if(SvxFmDrawPage::mpPage GetPage()-GetPageKind() != PK_NOTES)
{
-String aNewName( aName );
+SdDrawDocument* pDoc = GetModel()-GetDoc();
+sal_Bool bOutDummy;
+String aNewName( rName );
+
+// Slide Name has to be unique
+if( pDoc pDoc-GetPageByName( aNewName, bOutDummy ) !=
SDRPAGE_NOTFOUND )
+return; // throw Exception ?
+
GetPage()-SetName( aNewName );
-if(GetModel()-GetDoc())
-
GetModel()-GetDoc()-RenameLayoutTemplate(GetPage()-GetLayoutName(),
aNewName);
+if( pDoc )
+pDoc-RenameLayoutTemplate( GetPage()-GetLayoutName(), aNewName );
// fake a mode change to repaint the page tab bar
::sd::DrawDocShell* pDocSh = GetModel()-GetDocShell();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
