Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/inc/runtime.hxx
basic/source/runtime/step1.cxx
desktop/source/deployment/dp_services.cxx
drawinglayer/prj/d.lst
drawinglayer/source/primitive2d/makefile.mk
sfx2/source/appl/appinit.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/view/viewfrm.cxx
svx/source/fmcomp/gridctrl.cxx
vbahelper/source/vbahelper/vbahelper.cxx

4 files changed, 47 insertions, 6 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index dedcee555a19..ce25934559c9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -28,7 +28,7 @@
             </node>
             <node oor:name=".uno:ResetAttributes" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Clear Direct Formatting</value>
+                    <value xml:lang="en-US">Clear ~Direct Formatting</value>
                 </prop>
             </node>
             <node oor:name=".uno:ClearArrowPrecedents" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index f5725b320b15..07346a9e54ae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -891,7 +891,7 @@
             </node>
             <node oor:name=".uno:ResetAttributes" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Clear Direct Formatting</value>
+                    <value xml:lang="en-US">Clear ~Direct Formatting</value>
                 </prop>
             </node>
             <node oor:name=".uno:WrapOff" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 8dbccb20cfb2..e72e61b8f02b 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -348,7 +348,7 @@
                     <value >swform</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value>Base: Form Design</value>
+                    <value>Base: Database Form</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryWindowStateConfigRef">
                     <value >WriterFormWindowState</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ec73e01b6ada..8fa0e7e9f249 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2401,9 +2401,23 @@
                             <desc>ODFVER_LATEST</desc>
                           </info>
                         </enumeration>
-                      </constraints>
-                      <value>3</value>
-                  </prop>
+                    </constraints>
+                    <value>3</value>
+                </prop>
+                <prop oor:name="UseSHA1InODF12" oor:type="xs:boolean">
+                    <info>
+                        <author>MAV</author>
+                        <desc>Specifies whether SHA1 algorithm instead of SHA256 should be used in ODF12 for StartKey and Checksum generation during encryption.</desc>
+                    </info>
+                    <value>false</value>
+                </prop>
+                <prop oor:name="UseBlowfishInODF12" oor:type="xs:boolean">
+                    <info>
+                        <author>MAV</author>
+                        <desc>Specifies whether Blowfish algorithm instead of AES should be used in ODF12 for encryption.</desc>
+                    </info>
+                    <value>false</value>
+                </prop>
             </group>
 		</group>
 		<group oor:name="Load">
@@ -4842,6 +4856,33 @@
 							<value>1</value>
 						</prop>
 					</group>
+                    <group oor:name="SVG">
+                        <info>
+                            <author>KA</author>
+                            <desc>Specifies default settings of SVG export dialog.</desc>
+                        </info>
+                        <prop oor:name="TinyMode" oor:type="xs:boolean">
+                            <info>
+                                <author>KA</author>
+                                <desc>Specifies if SVG Tiny profile should be used for export.</desc>
+                            </info>
+                            <value>false</value>
+                        </prop>
+                        <prop oor:name="EmbedFonts" oor:type="xs:boolean">
+                            <info>
+                                <author>KA</author>
+                                <desc>Specifies if fonts should be embedded into SVG file.</desc>
+                            </info>
+                            <value>true</value>
+                        </prop>
+                        <prop oor:name="UseNativeTextDecoration" oor:type="xs:boolean">
+                            <info>
+                                <author>KA</author>
+                                <desc>Specifies if text decoration like underlining and strike-through be drawm by using SVG attributes (true) or by drawing SVG primitives (false).</desc>
+                            </info>
+                            <value>true</value>
+                        </prop>
+                    </group>            
 				</group>
 			</group>
 			<group oor:name="HTML">