sw/source/core/frmedt/fefly1.cxx | 2
writerfilter/source/dmapper/FFData.xml | 75 ---------------------------------
2 files changed, 1 insertion(+), 76 deletions(-)
New commits:
commit 418c5f7a4911bb2f1a06858556131b1bc4ad54f6
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 2 22:13:32 2014 +0200
coverity#735904 Unchecked dynamic_cast
Change-Id: I784fa73c69a25ccf5d750b92c6aa8815385df0a9
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index d7300e0..a20dceb 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1920,7 +1920,7 @@ OUString SwFEShell::GetObjTitle() const
const SwFrmFmt* pFmt = FindFrmFmt( pObj );
if ( pFmt->Which() == RES_FLYFRMFMT )
{
- return dynamic_cast<const SwFlyFrmFmt*>(pFmt)->GetObjTitle();
+ return static_cast<const SwFlyFrmFmt*>(pFmt)->GetObjTitle();
}
return pObj->GetTitle();
}
commit ec1ba489fa93297b18cc3a03954bf2048e04bbe0
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 2 22:03:43 2014 +0200
writerfilter: unused FFData.xml
Change-Id: Id30f35b8a357276c215b71e548ba46e86c51ad48
diff --git a/writerfilter/source/dmapper/FFData.xml
b/writerfilter/source/dmapper/FFData.xml
deleted file mode 100644
index 6cfdade..0000000
--- a/writerfilter/source/dmapper/FFData.xml
+++ /dev/null
@@ -1,75 +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 .
- -->
-<model>
- <class name="FFDataHandler">
- <parent name="Properties"/>
- <typedef name="Pointer_t" type="shared_ptr"/>
- <typedef name="DropDownEntries_t">
- <vector type="OUString"/>
- </typedef>
- <member name="name" type="OUString"/>
- <member name="enabled" type="bool"/>
- <member name="calcOnExit" type="bool"/>
- <member name="entryMacro" type="OUString"/>
- <member name="exitMacro" type="OUString"/>
- <member name="helpTextType" type="sal_uInt32"/>
- <member name="helpText" type="OUString"/>
- <member name="statusTextType" type="sal_uInt32"/>
- <member name="statusText" type="OUString"/>
- <member name="checkboxHeight" type="sal_uInt32"/>
- <member name="checkboxAutoHeight" type="bool"/>
- <member name="checkboxDefault" type="bool"/>
- <member name="checkboxChecked" type="bool"/>
- <member name="dropDownResult" type="OUString"/>
- <member name="dropDownDefault" type="OUString"/>
- <member name="dropDownEntries" type="DropDownEntries_t"/>
- <member name="textType" type="sal_uInt32"/>
- <member name="textMaxLength" type="sal_uInt32"/>
- <member name="textDefault" type="OUString"/>
- <member name="textFormat" type="OUString"/>
- <sprm>
- <element name="name" action="set" id="NS_ooxml::LN_CT_FFData_name"/>
- <element name="enabled" action="set"
id="NS_ooxml::LN_CT_FFData_enabled"/>
- <element name="calcOnExit" action="set"
id="NS_ooxml::LN_CT_FFData_calcOnExit"/>
- <element name="entryMacro" action="set"
id="NS_ooxml::LN_CT_FFData_entryMacro"/>
- <element name="exitMacro" action="set"
id="NS_ooxml::LN_CT_FFData_exitMacro"/>
- <element name="helpText" action="resolve"
id="NS_ooxml::LN_CT_FFData_helpText"/>
- <element name="statusText" action="resolve"
id="NS_ooxml::LN_CT_FFData_statusText"/>
- <element name="size" member="checkboxHeight" action="set"
id="NS_ooxml::LN_CT_FFCheckBox_size"/>
- <element name="sizeAuto" member="checkboxAutoHeight" action="set"
id="NS_ooxml::LN_CT_FFCheckBox_sizeAuto"/>
- <element name="default" member="checkboxDefault" action="set"
id="NS_ooxml::LN_CT_FFCheckBox_default"/>
- <element name="checked" member="checkboxChecked" action="set"
id="NS_ooxml::LN_CT_FFCheckBox_checked"/>
- <element name="checkBox" action="resolve"
id="NS_ooxml::LN_CT_FFData_checkBox"/>
- <element name="result" member="dropDownResult" action="set"
id="NS_ooxml::LN_CT_FFDDList_result"/>
- <element name="default" member="dropDownDefault" action="set"
id="NS_ooxml::LN_CT_FFDDList_default"/>
- <element name="listEntry" member="dropDownEntries" action="pushback"
id="NS_ooxml::LN_CT_FFDDList_listEntry"/>
- <element name="ddList" action="resolve"
id="NS_ooxml::LN_CT_FFData_ddList"/>
- <element name="type" member="textType" action="set"
id="NS_ooxml::LN_CT_FFTextInput_type"/>
- <element name="default" member="textDefault" action="set"
id="NS_ooxml::LN_CT_FFTextInput_default"/>
- <element name="maxLength" member="textMaxLength" action="set"
id="NS_ooxml::LN_CT_FFTextInput_maxLength"/>
- <element name="format" member="textFormat" action="set"
id="NS_ooxml::LN_CT_FFTextInput_format"/>
- <element name="textInput" action="resolve"
id="NS_ooxml::LN_CT_FFData_textInput"/>
- </sprm>
- <attribute>
- <attribute name="helpText:type" member="helpTextType"
id="NS_ooxml::LN_CT_FFHelpText_type"/>
- <attribute name="helpText:val" member="helpText"
id="NS_ooxml::LN_CT_FFHelpText_val"/>
- <attribute name="statusText:type" member="statusTextType"
id="NS_ooxml::LN_CT_FFStatusText_type"/>
- <attribute name="statusText:val" member="statusText"
id="NS_ooxml::LN_CT_FFStatusText_val"/>
- </attribute>
- </class>
-</model>
\ No newline at end of file
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
