core.git: 2 commits - sw/source toolkit/source

[Noel Grandin (via logerrit)]

 sw/source/writerfilter/rtftok/rtfsdrimport.cxx |   12 +---
 toolkit/source/controls/grid/gridcolumn.cxx|   22 +++---
 toolkit/source/controls/grid/gridcolumn.hxx|4 ++--
 3 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 95dcfa737d6ec4786e1afd33ced064e07976196e
Author: Noel Grandin 
AuthorDate: Thu May 2 15:25:49 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat May 4 15:08:25 2024 +0200

replace createFromAscii with OUString literals in RTFSdrImport

Change-Id: I3f49ee652817c778d3888d53f6151e998f689dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167116
Reviewed-by: Noel Grandin 
Tested-by: Jenkins

diff --git a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx 
b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
index da2a2bd1365f..dff40953d1bd 100644
--- a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
+++ b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
@@ -164,18 +164,16 @@ void RTFSdrImport::resolveLineColorAndWidth(bool 
bTextFrame,
 }
 else
 {
-static const char* aBorders[]
-= { "TopBorder", "LeftBorder", "BottomBorder", "RightBorder" };
-for (const char* pBorder : aBorders)
+static constexpr OUString aBorders[]
+= { u"TopBorder"_ustr, u"LeftBorder"_ustr, u"BottomBorder"_ustr, 
u"RightBorder"_ustr };
+for (const OUString& pBorder : aBorders)
 {
-auto aBorderLine = 
xPropertySet->getPropertyValue(OUString::createFromAscii(pBorder))
-   .get();
+auto aBorderLine = 
xPropertySet->getPropertyValue(pBorder).get();
 if (rLineColor.hasValue())
 aBorderLine.Color = rLineColor.get();
 if (rLineWidth.hasValue())
 aBorderLine.LineWidth = rLineWidth.get();
-xPropertySet->setPropertyValue(OUString::createFromAscii(pBorder),
-   uno::Any(aBorderLine));
+xPropertySet->setPropertyValue(pBorder, uno::Any(aBorderLine));
 }
 }
 }
commit d13bd5313a2a102f1be2eff439e602e57265febb
Author: Noel Grandin 
AuthorDate: Thu May 2 15:32:09 2024 +0200
Commit: Noel Grandin 
CommitDate: Sat May 4 15:08:13 2024 +0200

replace createFromAscii with OUString literals in GridColumn

Change-Id: Icfb1a4f1a4848e95687f8d1e18a77c55343478a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167118
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/toolkit/source/controls/grid/gridcolumn.cxx 
b/toolkit/source/controls/grid/gridcolumn.cxx
index 92d28ce9c822..a5165a63cd71 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -72,12 +72,12 @@ namespace toolkit
 }
 
 
-void GridColumn::broadcast_changed( char const * const 
i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue,
+void GridColumn::broadcast_changed( const OUString& i_asciiAttributeName, 
const Any& i_oldValue, const Any& i_newValue,
 std::unique_lock& i_Guard )
 {
 Reference< XInterface > const xSource( getXWeak() );
 GridColumnEvent const aEvent(
-xSource, OUString::createFromAscii( i_asciiAttributeName ),
+xSource, i_asciiAttributeName,
 i_oldValue, i_newValue, m_nIndex
 );
 
@@ -108,7 +108,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value)
 {
-impl_set( m_nColumnWidth, value, "ColumnWidth" );
+impl_set( m_nColumnWidth, value, u"ColumnWidth"_ustr );
 }
 
 
@@ -121,7 +121,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value)
 {
-impl_set( m_nMaxWidth, value, "MaxWidth" );
+impl_set( m_nMaxWidth, value, u"MaxWidth"_ustr );
 }
 
 
@@ -134,7 +134,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value)
 {
-impl_set( m_nMinWidth, value, "MinWidth" );
+impl_set( m_nMinWidth, value, u"MinWidth"_ustr );
 }
 
 
@@ -147,7 +147,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setTitle(const OUString & value)
 {
-impl_set( m_sTitle, value, "Title" );
+impl_set( m_sTitle, value, u"Title"_ustr );
 }
 
 
@@ -160,7 +160,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setHelpText( const OUString & value )
 {
-impl_set( m_sHelpText, value, "HelpText" );
+impl_set( m_sHelpText, value, u"HelpText"_ustr );
 }
 
 
@@ -173,7 +173,7 @@ namespace toolkit
 
 void SAL_CALL GridColumn::setResizeable(sal_Bool value)
 {
-impl_set( m_bResizeable, bool(value), "Resizeable" );
+impl_set( m_bResizeable, bool(value), u"Resizeable"_ustr );
 }
 
 
@@ -188,7 +188,7 @@ namespace toolkit
 {
 if ( i_value < 0 )
 throw IllegalArgumentException( OUString(), *this, 1 );
-impl_set( 

[Libreoffice-commits] core.git: 2 commits - sw/source toolkit/source writerfilter/source

[Stephan Bergmann (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx  |   10 +++---
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   16 +++-
 sw/source/uibase/docvw/SidebarWinAcc.cxx  |3 ++-
 toolkit/source/helper/unowrapper.cxx  |3 ++-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|9 +++--
 6 files changed, 19 insertions(+), 29 deletions(-)

New commits:
commit 1ae71d8f09771ba7180be6ebdf89d36a31eb8625
Author: Stephan Bergmann 
AuthorDate: Fri Dec 16 15:10:40 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 16 20:18:04 2022 +

Revert "fix math export/import in docx/rtf"

This reverts commit 2b5953a19e36a02040f2ff08bc87efe4785f80bd.  Whatever that
"gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast 
directly
to the target class" issue actually was:  For one, our GCC 7 baseline 
presumably
would no longer have such an issue.  And for another, the added asserts 
that the
results of the dynamic_casts must be non-null were presumably all bogus (and
have in part been reverted again in the meantime), as all the sources are 
UNO
interface types that can presumably point at implementation objects of other
than the expected C++ class types.  (Those dynamic_casts from UNO interface
types will be addressed in a follow-up commit.  See the upcoming commit
introducing loplugin:unocast on why such dynamic_casts are dangerous.)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/qa/extras/rtfexport/rtfexport.cxx
sw/source/filter/ww8/docxattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.cxx
writerfilter/Library_writerfilter.mk
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx

Change-Id: I0c330a3541e64ce08bfe30ff15d51a2fd8a243b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144336
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index da951db02828..b78094da7401 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -99,7 +99,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -5986,14 +5985,11 @@ void DocxAttributeOutput::WritePostponedMath(const 
SwOLENode* pPostponedMath, sa
 SAL_WARN("sw.ww8", "Broken math object");
 return;
 }
-// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast 
directly to the target class,
-// so help it with an intermediate cast. I'm not sure what exactly the problem 
is, seems to be unrelated
-// to RTLD_GLOBAL, so most probably a gcc bug.
-oox::FormulaExportBase* formulaexport = 
dynamic_cast(dynamic_cast(xInterface.get()));
-assert( formulaexport != nullptr );
-if (formulaexport)
+if( oox::FormulaExportBase* formulaexport = dynamic_cast< 
oox::FormulaExportBase* >( xInterface.get()))
 formulaexport->writeFormulaOoxml( m_pSerializer, 
GetExport().GetFilter().getVersion(),
 oox::drawingml::DOCUMENT_DOCX, nAlign);
+else
+OSL_FAIL( "Math OLE object cannot write out OOXML" );
 }
 
 void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index cd2f81a2463e..e81a299ec9f9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -66,7 +66,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -4188,16 +4187,15 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const 
SwFlyFrameFormat* pFlyFrameFormat
 uno::Reference xClosable = xObj->getComponent();
 if (!xClosable.is())
 return false;
-// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast 
directly to the target class,
-// so help it with an intermediate cast. I'm not sure what exactly the 
problem is, seems to be unrelated
-// to RTLD_GLOBAL, so most probably a gcc bug.
-auto pBase
-= 
dynamic_cast(dynamic_cast(xClosable.get()));
-assert(pBase != nullptr);
-OStringBuffer aBuf;
+auto pBase = dynamic_cast(xClosable.get());
+SAL_WARN_IF(!pBase, "sw.rtf", "Math OLE object cannot write out RTF");
 if (pBase)
+{
+OStringBuffer aBuf;
 pBase->writeFormulaRtf(aBuf, m_rExport.GetCurrentEncoding());
-m_aRunText->append(aBuf);
+m_aRunText->append(aBuf);
+}
+
 // Replacement graphic.
 m_aRunText->append("{" LO_STRING_SVTOOLS_RTF_MMATHPICT " ");
 FlyFrameOLEReplacement(pFlyFrameFormat, rOLENode, rSize);
diff --git 

[Libreoffice-commits] core.git: 2 commits - sw/source toolkit/source

[Bayram Çiçek (via logerrit)]

 sw/source/ui/misc/titlepage.cxx  |2 +-
 toolkit/source/awt/asynccallback.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 691f1cc959dab0418b28e7898825a6cae71b493e
Author: Bayram Çiçek 
AuthorDate: Thu Dec 24 13:11:04 2020 +
Commit: Julien Nabet 
CommitDate: Fri Dec 25 11:50:53 2020 +0100

tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ib9384b5106ef389b027787432c32e387a5f9ad81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108268
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/toolkit/source/awt/asynccallback.cxx 
b/toolkit/source/awt/asynccallback.cxx
index d017b3e259bb..751647447092 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -76,7 +76,7 @@ sal_Bool SAL_CALL AsyncCallback::supportsService(OUString 
const & serviceName)
 
 css::uno::Sequence< OUString > SAL_CALL 
AsyncCallback::getSupportedServiceNames()
 {
-return css::uno::Sequence< OUString >{ "com.sun.star.awt.AsyncCallback" };
+return { "com.sun.star.awt.AsyncCallback" };
 }
 
 // css::awt::XRequestCallback:
commit b905937211154b0e923312641f09629e68ed7901
Author: Julien Nabet 
AuthorDate: Fri Dec 25 10:46:51 2020 +0100
Commit: Julien Nabet 
CommitDate: Fri Dec 25 11:50:43 2020 +0100

tdf#139218: Title Page: fix "Reset page number", put default at 1

Change-Id: Ic3758d8eeeb1818e3be3ca5d815fa601a34e8dd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108279
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 26fa4bdeb564..06767dbe3844 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -205,10 +205,10 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent)
 m_xDocumentStartRB->connect_toggled(aStartPageHdl);
 m_xPageStartRB->connect_toggled(aStartPageHdl);
 
+m_xRestartNumberingNF->set_value(nResetPage);
 if (bMaybeResetNumbering && nResetPage > 0)
 {
 m_xRestartNumberingCB->set_active(true);
-m_xRestartNumberingNF->set_value(nResetPage);
 }
 m_xRestartNumberingNF->set_sensitive(m_xRestartNumberingCB->get_active());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/source toolkit/source unoxml/source uui/source vcl/source vcl/unx xmloff/source

[Wastack]

 sw/source/core/bastyp/calc.cxx  |2 
 sw/source/core/crsr/bookmrk.cxx |6 +-
 sw/source/core/doc/CntntIdxStore.cxx|6 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   42 
 sw/source/core/doc/DocumentFieldsManager.cxx|4 -
 sw/source/core/doc/DocumentRedlineManager.cxx   |   10 +--
 sw/source/core/doc/DocumentStylePoolManager.cxx |   14 ++---
 sw/source/core/doc/SwStyleNameMapper.cxx|   12 ++--
 sw/source/core/doc/docbm.cxx|   28 +-
 sw/source/core/doc/doccomp.cxx  |4 -
 sw/source/core/doc/doccorr.cxx  |8 +--
 sw/source/core/doc/docnum.cxx   |2 
 sw/source/core/draw/dcontact.cxx|2 
 sw/source/core/layout/flycnt.cxx|2 
 sw/source/core/text/itrform2.cxx|6 +-
 sw/source/core/tox/tox.cxx  |2 
 sw/source/core/txtnode/atrftn.cxx   |6 +-
 sw/source/core/txtnode/ndtxt.cxx|2 
 sw/source/core/unocore/unocoll.cxx  |4 -
 sw/source/core/unocore/unodraw.cxx  |2 
 sw/source/core/unocore/unoportenum.cxx  |6 +-
 sw/source/core/unocore/unotbl.cxx   |2 
 sw/source/filter/html/css1atr.cxx   |2 
 sw/source/filter/ww8/wrtw8esh.cxx   |4 -
 sw/source/ui/envelp/envfmt.cxx  |4 -
 sw/source/uibase/app/apphdl.cxx |2 
 sw/source/uibase/docvw/HeaderFooterWin.cxx  |6 +-
 sw/source/uibase/utlui/content.cxx  |8 +--
 toolkit/source/awt/vclxmenu.cxx |4 -
 toolkit/source/awt/vclxtoolkit.cxx  |6 +-
 toolkit/source/controls/controlmodelcontainerbase.cxx   |4 -
 toolkit/source/controls/grid/sortablegriddatamodel.cxx  |2 
 toolkit/source/controls/tree/treedatamodel.cxx  |2 
 toolkit/source/controls/unocontrols.cxx |2 
 unoxml/source/rdf/librdf_repository.cxx |   24 -
 uui/source/iahndl.cxx   |2 
 vcl/source/control/field.cxx|   10 +--
 vcl/source/control/imp_listbox.cxx  |4 -
 vcl/source/control/longcurr.cxx |   10 +--
 vcl/source/filter/wmf/enhwmf.cxx|2 
 vcl/source/gdi/print.cxx|4 -
 vcl/source/image/ImplImageTree.cxx  |6 +-
 vcl/source/window/toolbox.cxx   |2 
 vcl/unx/generic/fontmanager/fontconfig.cxx  |2 
 vcl/unx/generic/gdi/salgdi.cxx  |4 -
 vcl/unx/generic/window/salframe.cxx |2 
 vcl/unx/gtk/salprn-gtk.cxx  |   14 ++---
 xmloff/source/core/xmlimp.cxx   |2 
 xmloff/source/forms/propertyimport.cxx  |2 
 xmloff/source/style/xmlaustp.cxx|2 
 xmloff/source/text/txtexppr.cxx |8 +--
 xmloff/source/text/txtimppr.cxx |4 -
 xmloff/source/text/txtparae.cxx |4 -
 53 files changed, 163 insertions(+), 163 deletions(-)

New commits:
commit 84fd42c1f58627f3e03ee6062fa2812a4890d941
Author: Wastack 
Date:   Thu Mar 31 08:48:33 2016 +0200

tdf#97966  Drop 'static' keywords

Including no keywords from extern "C" blocks

Change-Id: I7769c9d2a131d7389ef6ab08c0fbd12bc624778c
Reviewed-on: https://gerrit.libreoffice.org/23678
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 7625353..c8e0601 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -300,7 +300,7 @@ UUIInteractionHelper::tryOtherInteractionHandler(
 namespace
 {
 
-static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& 
i_rTypeName, const OUString& i_rPropagation )
+bool lcl_matchesRequest( const Any& i_rRequest, const OUString& 
i_rTypeName, const OUString& i_rPropagation )
 {
 const css::uno::TypeDescription aTypeDesc( i_rTypeName );
 const typelib_TypeDescription* pTypeDesc = aTypeDesc.get();
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 75565c5..849f2f0 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -51,7 +51,7 @@ namespace
 #define FORMAT_METRIC2
 #define FORMAT_CURRENCY  3
 
-static sal_Int64 ImplPower10( sal_uInt16 n )
+sal_Int64 ImplPower10( 

[Libreoffice-commits] core.git: 2 commits - sw/source toolkit/source vcl/unx vcl/win

[Michael Stahl]

 sw/source/core/frmedt/fefly1.cxx|7 ---
 toolkit/source/awt/vclxfont.cxx |1 +
 toolkit/source/awt/vclxgraphics.cxx |1 +
 vcl/unx/gtk/a11y/atkwrapper.cxx |1 +
 vcl/win/source/gdi/winlayout.cxx|5 +
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 91567c26f436ccce0fb60ad6a9671f046a4a68e7
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 23 11:04:05 2015 +0100

calling alloca() requires #include sal/alloca.h

Change-Id: I59e5ede0c0cfb10f4196d79ae762132ae4ecb9bb

diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index d3b4f27..d937ad4 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -26,6 +26,7 @@
 #include cppuhelper/queryinterface.hxx
 #include rtl/uuid.h
 #include rtl/ustring.h
+#include sal/alloca.h
 
 #include vcl/outdev.hxx
 
diff --git a/toolkit/source/awt/vclxgraphics.cxx 
b/toolkit/source/awt/vclxgraphics.cxx
index 1b11197..cfc6b15 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -26,6 +26,7 @@
 #include cppuhelper/typeprovider.hxx
 #include cppuhelper/queryinterface.hxx
 #include rtl/uuid.h
+#include sal/alloca.h
 
 #include vcl/svapp.hxx
 #include vcl/outdev.hxx
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 4f34e0e..6d972ff 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -55,6 +55,7 @@
 
 #include rtl/ref.hxx
 #include osl/diagnose.h
+#include sal/alloca.h
 #include cppuhelper/factory.hxx
 #include cppuhelper/queryinterface.hxx
 
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 9db8f43..bcadd8d 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -32,10 +32,7 @@
 #include sallayout.hxx
 
 #include cstdio
-#include malloc.h
-#ifndef __MINGW32__
-#define alloca _alloca
-#endif
+#include sal/alloca.h
 
 #include algorithm
 
commit c5b6b206c0e80fae7de4d452334541d2198d41ba
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jan 22 23:30:46 2015 +0100

sw: redo check in SwFEShell::FindAnchorPos() a bit (related: fdo#87760)

The only valid non-txtnode return value for the SwPosition is the
unmodified initial value (hopefully).

Change-Id: Ib5789455576a20848dd7f0542bd520aa04040b90

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index bdae991..48f78e6 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -427,11 +427,12 @@ Point SwFEShell::FindAnchorPos( const Point rAbsPos, 
bool bMoveIt )
 SwPosition aPos( GetDoc()-GetNodes().GetEndOfExtras() );
 Point aTmpPnt( rAbsPos );
 GetLayout()-GetCrsrOfst( aPos, aTmpPnt, aState );
-if ( nAnchorId != FLY_AT_CHAR
- || !PosInsideInputFld( aPos ) )
+if (aPos.nNode != GetDoc()-GetNodes().GetEndOfExtras().GetIndex()
+ (nAnchorId != FLY_AT_CHAR || !PosInsideInputFld(aPos)))
 {
 SwCntntNode* pCNode = aPos.nNode.GetNode().GetCntntNode();
-pTxtFrm = pCNode ? pCNode-getLayoutFrm(GetLayout(), 0, aPos, 
false) : NULL;
+assert(pCNode);
+pTxtFrm = pCNode-getLayoutFrm(GetLayout(), 0, aPos, false);
 }
 }
 const SwFrm *pNewAnch = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits