[Libreoffice-commits] core.git: bin/gbuild-to-ide bin/gbuild-to-ideNS solenv/vs

Mike Kaganski mike.kaganski at collabora.com
Wed Jul 5 07:05:46 UTC 2017


 bin/gbuild-to-ide            |   10 ++
 bin/gbuild-to-ideNS          |    5 +
 solenv/vs/LibreOffice.natvis |  161 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+)

New commits:
commit 96dec6af8fbc7f46f2032a227c47370256b7d5a9
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Jul 4 20:08:49 2017 +0300

    gbuild-to-ide: add VisualStudio visualizers file to solution
    
    See https://msdn.microsoft.com/en-us/library/jj620914
    
    Change-Id: Ibd18f1c36c46ea47c897542f35e3ea2a8bc0a8ac
    Reviewed-on: https://gerrit.libreoffice.org/39510
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index ffa85d3a42e4..0ff7579e1c84 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -291,6 +291,11 @@ class testVS2013Ide(IdeIntegrationGenerator):
                         f.write('\t\t{%(guid)s} = {%(guid)s}\n' % {'guid': lib_guid})
                     f.write('\tEndProjectSection\n')
                 f.write('EndProject\n')
+            f.write('Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9292527-A979-4D13-A598-C75A33222174}"\n')
+            f.write('\tProjectSection(SolutionItems) = preProject\n')
+            f.write('\t\tsolenv/vs/LibreOffice.natvis = solenv/vs/LibreOffice.natvis\n')
+            f.write('\tEndProjectSection\n')
+            f.write('EndProject\n')
             f.write('Global\n')
             platform = 'Win32'
             f.write('\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n')
@@ -893,6 +898,11 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
                         f.write('\t\t{%(guid)s} = {%(guid)s}\n' % {'guid': lib_guid})
                     f.write('\tEndProjectSection\n')
                 f.write('EndProject\n')
+            f.write('Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9292527-A979-4D13-A598-C75A33222174}"\n')
+            f.write('\tProjectSection(SolutionItems) = preProject\n')
+            f.write('\t\tsolenv/vs/LibreOffice.natvis = solenv/vs/LibreOffice.natvis\n')
+            f.write('\tEndProjectSection\n')
+            f.write('EndProject\n')
             f.write('Global\n')
             platform = 'Win32'
             f.write('\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n')
diff --git a/bin/gbuild-to-ideNS b/bin/gbuild-to-ideNS
index 38785312055b..44970c466b77 100755
--- a/bin/gbuild-to-ideNS
+++ b/bin/gbuild-to-ideNS
@@ -803,6 +803,11 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
                         f.write('\t\t{%(guid)s} = {%(guid)s}\n' % {'guid': lib_guid})
                     f.write('\tEndProjectSection\n')
                 f.write('EndProject\n')
+            f.write('Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9292527-A979-4D13-A598-C75A33222174}"\n')
+            f.write('\tProjectSection(SolutionItems) = preProject\n')
+            f.write('\t\tsolenv/vs/LibreOffice.natvis = solenv/vs/LibreOffice.natvis\n')
+            f.write('\tEndProjectSection\n')
+            f.write('EndProject\n')
             f.write('Global\n')
             platform = 'Win32'
             f.write('\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n')
diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
new file mode 100644
index 000000000000..3326c1fcfd9c
--- /dev/null
+++ b/solenv/vs/LibreOffice.natvis
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * 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/.
+ *
+-->
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="rtl::OUString">
+    <DisplayString>{*pData}</DisplayString>
+    <StringView>*pData,su</StringView>
+  </Type>
+  <Type Name="rtl::OString">
+    <DisplayString>{*pData}</DisplayString>
+    <StringView>*pData,s</StringView>
+  </Type>
+  <Type Name="_rtl_uString">
+    <DisplayString Condition="length == 0">empty</DisplayString>
+    <DisplayString>{buffer,su}</DisplayString>
+    <StringView>buffer,su</StringView>
+  </Type>
+  <Type Name="_rtl_String">
+    <DisplayString Condition="length == 0">empty</DisplayString>
+    <DisplayString>{buffer,s}</DisplayString>
+    <StringView>buffer,s</StringView>
+  </Type>
+  <Type Name="com::sun::star::uno::Any">
+    <!--
+    typelib_TypeClass_VOID = 0,
+    typelib_TypeClass_ANY = 14,
+    typelib_TypeClass_TYPEDEF = 16,
+    typelib_TypeClass_STRUCT = 17,
+    typelib_TypeClass_UNION = 18,/** Deprecated, UNOIDL does not have a union concept.*/
+    typelib_TypeClass_EXCEPTION = 19,
+    typelib_TypeClass_ARRAY = 21,/** Deprecated, UNOIDL does not have an array concept.*/
+    typelib_TypeClass_SERVICE = 23,/** (not implemented) */
+    typelib_TypeClass_MODULE = 24,/** (not implemented) */
+    typelib_TypeClass_INTERFACE_METHOD = 25,
+    typelib_TypeClass_INTERFACE_ATTRIBUTE = 26,
+    typelib_TypeClass_UNKNOWN = 27,
+    typelib_TypeClass_PROPERTY = 28,
+    typelib_TypeClass_CONSTANT = 29,
+    typelib_TypeClass_CONSTANTS = 30,
+    typelib_TypeClass_SINGLETON = 31,
+    -->
+    <DisplayString Condition="pType->eTypeClass == 1">{pType->eTypeClass,en}: {*((wchar_t*)pData),c}</DisplayString><!-- typelib_TypeClass_CHAR -->
+    <DisplayString Condition="pType->eTypeClass == 2">{pType->eTypeClass,en}: {*((bool*)pData),d}</DisplayString><!-- typelib_TypeClass_BOOLEAN -->
+    <DisplayString Condition="pType->eTypeClass == 3">{pType->eTypeClass,en}: {*((unsigned char*)pData),d}</DisplayString><!-- typelib_TypeClass_BYTE -->
+    <DisplayString Condition="pType->eTypeClass == 4">{pType->eTypeClass,en}: {(*((short*)pData) & 0xFFFF),d}</DisplayString><!-- typelib_TypeClass_SHORT -->
+    <DisplayString Condition="pType->eTypeClass == 5">{pType->eTypeClass,en}: {(*((unsigned short*)pData) & 0xFFFF),d}</DisplayString><!-- typelib_TypeClass_UNSIGNED_SHORT -->
+    <DisplayString Condition="pType->eTypeClass == 6">{pType->eTypeClass,en}: {*((int*)pData),d}</DisplayString><!-- typelib_TypeClass_LONG -->
+    <DisplayString Condition="pType->eTypeClass == 7">{pType->eTypeClass,en}: {*((unsigned int*)pData),d}</DisplayString><!-- typelib_TypeClass_UNSIGNED_LONG -->
+    <DisplayString Condition="pType->eTypeClass == 8">{pType->eTypeClass,en}: {*((__int64*)pData),d}</DisplayString><!-- typelib_TypeClass_HYPER -->
+    <DisplayString Condition="pType->eTypeClass == 9">{pType->eTypeClass,en}: {*((unsigned __int64*)pData),d}</DisplayString><!-- typelib_TypeClass_UNSIGNED_HYPER -->
+    <DisplayString Condition="pType->eTypeClass == 10">{pType->eTypeClass,en}: {*((float*)pData)}</DisplayString><!-- typelib_TypeClass_FLOAT -->
+    <DisplayString Condition="pType->eTypeClass == 11">{pType->eTypeClass,en}: {*((double*)pData)}</DisplayString><!-- typelib_TypeClass_DOUBLE -->
+    <DisplayString Condition="pType->eTypeClass == 12">{pType->eTypeClass,en}: {*((rtl::OUString*)pData)}</DisplayString><!-- typelib_TypeClass_STRING -->
+    <DisplayString Condition="pType->eTypeClass == 13">{pType->eTypeClass,en}: {*((com::sun::star::uno::Type*)pData)}</DisplayString><!-- typelib_TypeClass_TYPE -->
+    <DisplayString Condition="pType->eTypeClass == 15">{pType->eTypeClass,en}: {*((sal_Int32*)pData),d}</DisplayString><!-- typelib_TypeClass_ENUM -->
+    <DisplayString Condition="pType->eTypeClass == 20">{pType->eTypeClass,en}: {*((uno_Sequence **)pData)}</DisplayString><!-- typelib_TypeClass_SEQUENCE -->
+    <DisplayString Condition="pType->eTypeClass == 22">{pType->eTypeClass,en}: {*((com::sun::star::uno::BaseReference *)pData)}</DisplayString><!-- typelib_TypeClass_INTERFACE -->
+    <DisplayString>{pType->eTypeClass,en}</DisplayString>
+    <Expand>
+      <Item Name="Data" Condition="pType->eTypeClass == 22">*((com::sun::star::uno::BaseReference *)pData)</Item>
+      <Item Name="Data" Condition="pType->eTypeClass != 22">pData</Item>
+    </Expand>
+  </Type>
+  <Type Name="basegfx::internal::ImplMatLine<3>">
+    <DisplayString>{mfValue[0]}, {mfValue[1]}, {mfValue[2]}</DisplayString>
+  </Type>
+  <Type Name="basegfx::internal::ImplHomMatrixTemplate<3>">
+    <DisplayString>{{{maLine[0]}}}, {{{maLine[1]}}}, {mpLine}</DisplayString>
+  </Type>
+  <Type Name="o3tl::cow_wrapper<basegfx::Impl2DHomMatrix,o3tl::UnsafeRefCountingPolicy>::impl_t">
+    <DisplayString>{m_value}</DisplayString>
+  </Type>
+  <Type Name="o3tl::cow_wrapper<basegfx::Impl2DHomMatrix,o3tl::UnsafeRefCountingPolicy>">
+    <DisplayString>{m_pimpl}</DisplayString>
+  </Type>
+  <Type Name="basegfx::B2DHomMatrix">
+    <DisplayString>{mpImpl}</DisplayString>
+  </Type>
+  <Type Name="Point">
+    <DisplayString>X:{nA}, Y:{nB}</DisplayString>
+  </Type>
+  <Type Name="Size">
+    <DisplayString>Width:{nA}, Height:{nB}</DisplayString>
+  </Type>
+  <Type Name="Range">
+    <DisplayString>Min:{nA}, Max:{nB}</DisplayString>
+  </Type>
+  <Type Name="Selection">
+    <DisplayString>Min:{nA}, Max:{nB}</DisplayString>
+  </Type>
+  <Type Name="Pair">
+    <DisplayString>A:{nA}, B:{nB}</DisplayString>
+  </Type>
+  <Type Name="SwRect">
+    <DisplayString>{m_Point}, {m_Size}</DisplayString>
+  </Type>
+  <Type Name="com::sun::star::uno::Sequence<*>">
+    <DisplayString Condition="_pSequence->nElements == 0">empty</DisplayString>
+    <DisplayString>Sequence of {_pSequence->nElements} {"$T1",sb}</DisplayString>
+    <Expand>
+      <Item Name="[size]">_pSequence->nElements</Item>
+      <ArrayItems>
+        <Size>_pSequence->nElements</Size>
+        <ValuePointer>reinterpret_cast< const $T1 * >( _pSequence->elements )</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
+  <Type Name="SwNodes">
+    <DisplayString>{{{m_nSize} nodes}}</DisplayString>
+    <Expand>
+      <Item Name="[Count]">m_nSize</Item>
+
+      <CustomListItems>
+        <Variable Name="idx" InitialValue="0"/>
+        <Variable Name="blockIx" InitialValue="0"/>
+        <Variable Name="p" InitialValue="m_vpInf[ 0 ]"/>
+
+        <Size>m_nSize</Size>
+        <Loop>
+          <Break Condition="idx >= m_nSize"/>
+
+          <If Condition="p->nStart > idx || p->nEnd < idx">
+            <Exec>blockIx = 0</Exec>
+            <Loop>
+              <Break Condition="blockIx >= m_vpInf._Mypair._Myval2._Mylast - m_vpInf._Mypair._Myval2._Myfirst"/>
+              <Break Condition="p->nStart <= idx && p->nEnd >= idx"/>
+              <Exec>blockIx++</Exec>
+              <Exec>p = m_vpInf[ blockIx ]</Exec>
+            </Loop>
+          </If>
+          <Item>*static_cast<SwNodePtr>(p->mvData[ idx - p->nStart ])</Item>
+          <Exec>idx++</Exec>
+        </Loop>
+
+      </CustomListItems>
+    </Expand>
+  </Type>
+  <Type Name="SwNode">
+    <DisplayString>{{SwNode}}</DisplayString>
+  </Type>
+  <Type Name="SwEndNode">
+    <DisplayString>{{SwEndNode}}</DisplayString>
+  </Type>
+  <Type Name="SwStartNode">
+    <DisplayString Condition="m_eStartNodeType	== 1">{{SwTableBoxStartNode}}</DisplayString>
+    <DisplayString Condition="m_eStartNodeType	== 2">{{SwFlyStartNode}}</DisplayString>
+    <DisplayString Condition="m_eStartNodeType	== 3">{{SwFootnoteStartNode}}</DisplayString>
+    <DisplayString Condition="m_eStartNodeType	== 4">{{SwHeaderStartNode}}</DisplayString>
+    <DisplayString Condition="m_eStartNodeType	== 5">{{SwFooterStartNode}}</DisplayString>
+    <DisplayString>{{SwStartNode}}</DisplayString>
+  </Type>
+  <Type Name="SwTextNode">
+    <DisplayString>{{SwTextNode: {m_Text}}}</DisplayString>
+  </Type>
+</AutoVisualizer>
\ No newline at end of file


More information about the Libreoffice-commits mailing list