diff options
Diffstat (limited to 'odk')
23 files changed, 409 insertions, 315 deletions
diff --git a/odk/README b/odk/README new file mode 100644 index 000000000000..8af3eed6ef2e --- /dev/null +++ b/odk/README @@ -0,0 +1,3 @@ +Office development kit - implements the first step on the way to the LibreOffice SDK tarball. + +Part of the SDK; to build you need to add --enable-odk. diff --git a/odk/configure.pl b/odk/configure.pl index 533c881cb764..4749238af8d2 100755 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -620,6 +620,9 @@ sub searchprog sub searchMacOffice { + if (-d "/Applications/LibreOffice.app" ) { + return "/Applications/LibreOffice.app" + } if (-d "/Applications/OpenOffice.org.app" ) { return "/Applications/OpenOffice.org.app" } diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css deleted file mode 100644 index 0d279b9bc9b5..000000000000 --- a/odk/docs/cpp/ref/cpp.css +++ /dev/null @@ -1,127 +0,0 @@ -/* Autodoc css file for C++ documentation */ - - -body { background-color:#ffffff; } - -#adc-cppref a { color: #000000; text-decoration: none; } -#adc-cppref a:link { color: #18A303; text-decoration: none; } -#adc-cppref a:hover { text-decoration: underline; } -#adc-cppref a:visited { color: #106802; } - -#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; } -#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; } -#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; } -#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } -#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; } -#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; - background-color:#c2f6ba; } -#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } -#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } -#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; } -#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; } -#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; } -#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; } -#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; } -#adc-cppref tr { font-size:10pt; } -#adc-cppref td { font-size:10pt; } - -#adc-cppref dt.attention { color:#ff0000; } - -#adc-cppref div.title { text-align:center; line-height:26pt; - background-color:#18a303; } -#adc-cppref .subtitle {background-color:#18a303; } - -#adc-cppref td.flagname { background-color:#c2f6ba; - font-family:Arial; font-size:8pt; font-weight:bold; } -#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; } -#adc-cppref td.flagno { font-family:Arial; font-size:8pt; } -#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; } - -#adc-cppref td.navimain - { background-color:#c2f6ba; - font-family:Arial; font-size:12pt; font-weight:bold; } - -/* background-color:#eeeeff; color:#000000; */ - -#adc-cppref td.navimainself - { background-color:#106802; color:#ffffff; - font-family:Arial; font-size:12pt; font-weight:bold; } -#adc-cppref td.navimainnone - {background-color:#c2f6ba; - font-family:Arial; font-size:12pt; } - -#adc-cppref div.define { font-family:Arial; background-color:#c2f6ba; } - -#adc-cppref .nqclass { color:#008800; } - -#adc-cppref h3.help { background-color:#c2f6ba; margin-top:12pt; } - -#adc-cppref .btpubl { color:#c2f6ba; } -#adc-cppref .btprot { color:#18a303; } -#adc-cppref .btpriv { color:#00ff00; } -#adc-cppref .btvpubl { color:#87c2e6; font-style:italic; } -#adc-cppref .btvprot { color:#18a303; font-style:italic; } -#adc-cppref .btvpriv { color:#00ff00; font-style:italic; } -#adc-cppref .btself { font-weight:bold; } - -#adc-cppref table { empty-cells:show; } - -#adc-cppref .childlist td, -#adc-cppref .commentedlinks td, -#adc-cppref .memberlist td, -#adc-cppref .title-table td, -#adc-cppref .subtitle td, -#adc-cppref .crosstitle td { border: .1pt solid grey } - -#adc-cppref .flag-table td { border: .1pt solid #cccccc; } - -#adc-cppref .table-in-method td, -#adc-cppref .table-in-data td, -#adc-cppref .navimain td, -#adc-cppref .navisub td, -#adc-cppref .expl-table td, -#adc-cppref .param-table td { border: none; } - - -/* Explanation of CSS classes: - -dl.member provides coloured frame for function descriptions. -dd.member makes the content of this frame white - -dt.attention special colour for @attention remarks - -div.title HTML page headline -.subtitle headline of lists of members and similar - - These are for the flagtables in classes: -td.flagname Flag name. -td.flagyes flag value "yes" -td.flagno flag value "no" -td.flagtext other flag value - - - These are for the main navigationbar: -td.navimain, td.navimain a - Links in navibar. -td.navimainself Text in navibar which refers to current page. -td.navimainnone Text which links to nothing. - - -div.define Subtitles on the #define/macro descriptions page - -.nqclass special color for classes in the qualification - on top of type pages like in: - ::nsp1::nsp2::_ClassXY_:: - -h3.help Subtitles on the help page - - These are for the base class tree on class pages: -.btpubl public base class -.btprot protected -.btpriv private -.btvpubl virtual public -.btvprot virtual protected -.btvpriv virtual private -.btself placeholder for currently displayed class - -*/ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 5b973342bdf7..8080e5638515 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -244,14 +244,14 @@ Sequence< OUString > MyService1Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService1Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new MyService1Impl( xContext) ); } // forward decl: implemented in service2_impl.cxx Reference< XInterface > SAL_CALL create_MyService2Impl( - Reference< XComponentContext > const & ) SAL_THROW( () ); + Reference< XComponentContext > const & ) SAL_THROW(()); } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index ff3942d26f67..6d498dbe95df 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -55,7 +55,7 @@ extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl(); extern OUString SAL_CALL getImplementationName_MyService1Impl(); extern Reference< XInterface > SAL_CALL create_MyService1Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ); + SAL_THROW(()); static Sequence< OUString > getSupportedServiceNames_MyService2Impl() { @@ -170,7 +170,7 @@ Sequence< OUString > MyService2Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService2Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW( () ) + SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new MyService2Impl( xContext ) ); } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx index 912f07bb64d7..ed2f76303453 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx @@ -79,13 +79,13 @@ namespace connectivity ,nSearchType( ::com::sun::star::sdbc::ColumnSearch::FULL) {} - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW(()) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW(()) { } sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index ea1bf91b644e..2d24f8ba5e9c 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -302,7 +302,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( // ------------------------------------------------------------------------- void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { - // set the value to what ever is nescessary + // set the value to what ever is necessary switch(nHandle) { case PROPERTY_ID_QUERYTIMEOUT: diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java index 947b6c30132c..343453acf286 100644 --- a/odk/examples/DevelopersGuide/Forms/URLHelper.java +++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java @@ -32,7 +32,7 @@ public class URLHelper { /** * Because the office need URLs for loading/saving documents - * we must convert used system pathes. + * we must convert used system paths. * And java use another notation for file URLs ... correct it. * * @param aSystemPath diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index a7cd1ce0eb46..8f3f7f1813e0 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -565,7 +565,7 @@ public class FunctionHelper OfficeConnect.getOfficeContext(); // First prepare frame for loading - // We must adress it inside the frame tree without any complications. + // We must address it inside the frame tree without any complications. // So we set an unambigous (we hope it) name and use it later. // Don't forget to reset original name after that. sOldName = xFrame.getName(); diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Install.txt b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Install.txt index fc7c95afbb98..79a1ee2bfcc5 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Install.txt +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Install.txt @@ -6,5 +6,5 @@ (5) copy from an existing java installation the runtime library "jawt" (e.g. jawt.dll for windows) into this directory (6) copy "api/<platform>/bin/nativelib.dll" (for windows) to "api/<platform>/class" -(7) start an office : "soffice -accept=socket,host=localhost,port=2083;urp;" +(7) start an office : "soffice --accept=socket,host=localhost,port=2083;urp;" (8) goto "api/<platform>/class" and start java applet: "java -jar desktop.jar" diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile index 23c86e57c5ed..bb1dfc20308a 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile @@ -95,7 +95,7 @@ ProUNOCppBindingExample : $(APP1_BINARY) $(APP2_BINARY) @echo $(SQM) $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=... @echo $(SQM) $(SQM)Before you can run this example you have to start your office in listening mode. @echo - - @echo $(SQM) $(SQM)soffice "$(QM)-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" + @echo $(SQM) $(SQM)soffice "$(QM)--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" @echo ----- @echo Please use one of the following commands to execute the examples! @echo - diff --git a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile index deaade0b9d81..e0565ddad175 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile @@ -70,7 +70,7 @@ $(EXAMPLE_NAME) : $(CLASSFILES) @echo Note: For these examples you need a running office listening on port 2083. @echo $(SQM) $(SQM)Before you run these examples you have to start your office with @echo - - @echo $(SQM) $(SQM)soffice "$(QM)-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" + @echo $(SQM) $(SQM)soffice "$(QM)--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" @echo ----- @echo Please use one of the following commands to execute the examples! @echo - diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 1ae8efdb14b0..176ad26800f6 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -115,7 +115,7 @@ Presentation Documents</a></td> <td class="content3"><img src="../../docs/images/arrow-1.gif"></td> <td><a href="#BasicandDialogs" - title="link to the Basic And Dialogs examples">OpenOffice.org %PRODUCT_RELEASE% Basic and + title="link to the Basic And Dialogs examples">LibreOffice %PRODUCT_RELEASE% Basic and Dialogs</a></td> </tr> <tr valign="top"> @@ -214,7 +214,7 @@ examples</a></td> href="./FirstSteps/FirstUnoContact.java" title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact</a></td> <td class="cell80">Shows how to initialize UNO and -get a remote office service manager from a running OpenOffice.org %PRODUCT_RELEASE% in a +get a remote office service manager from a running LibreOffice %PRODUCT_RELEASE% in a different process space.</td> </tr> <tr> @@ -223,7 +223,7 @@ different process space.</td> href="./FirstSteps/FirstLoadComponent.java" title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent</a></td> <td class="cell80">Demonstrates how to load a -component into OpenOffice.org %PRODUCT_RELEASE% by a Java application.</td> +component into LibreOffice %PRODUCT_RELEASE% by a Java application.</td> </tr> <tr> <td class="cell20"><img @@ -314,7 +314,7 @@ mechanism in C++.</td> href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java" title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient</a></td> <td class="cell80">Implements a client which is aware -of losing connection to OpenOffice.org %PRODUCT_RELEASE%.</td> +of losing connection to LibreOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><img @@ -322,7 +322,7 @@ of losing connection to OpenOffice.org %PRODUCT_RELEASE%.</td> href="./ProfUNO/InterprocessConn/UrlResolver.java" title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td> <td class="cell80">Builds a connection to -OpenOffice.org %PRODUCT_RELEASE% using the URL given on the command line. This example +LibreOffice %PRODUCT_RELEASE% using the URL given on the command line. This example shows the usage of <a href="../../docs/common/ref/com/sun/star/bridge/XUnoUrlResolver.html" title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td> @@ -345,7 +345,7 @@ shows the usage of <a href="./ProfUNO/CppBinding/office_connect.cxx" title="link to ProfUNO/CppBinding/office_connect.java">office_connect.cxx</a></td> <td class="cell80">Builds a connection to -OpenOffice.org %PRODUCT_RELEASE% using C++.</td> +LibreOffice %PRODUCT_RELEASE% using C++.</td> </tr> <tr> <td class="cell20"><img @@ -706,7 +706,7 @@ for the image shrink component and instantiates it.</td> href="./Components/DialogComponent/DialogComponent.java" title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java</a></td> <td class="cell80">Implements a component accessing a dialog created - with the OpenOffice.org %PRODUCT_RELEASE% Basic IDE. The component provides methods that + with the LibreOffice %PRODUCT_RELEASE% Basic IDE. The component provides methods that can be bound to dialog respectively control events .</td> </tr> <tr> @@ -923,7 +923,7 @@ document component.</td> <td class="cell80">This is the main part of a demo application based on the framework APIs. It mainly shows the mechanisms to load, store and convert documents, as well as dispatch and dispatch -interception. It integrates windows from OpenOffice.org %PRODUCT_RELEASE% via system +interception. It integrates windows from LibreOffice %PRODUCT_RELEASE% via system window handle. This is the same mechanism as used by the OOoBean, but the OOoBean itself is not used here, just the JNI window handle access.</td> </tr> @@ -939,7 +939,7 @@ and it's actions.</td> href="./OfficeDev/DesktopEnvironment/FunctionHelper.java" title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td> <td class="cell80">This helper comprises all -OpenOffice.org %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these +LibreOffice %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these aspects separately from the rest of the application example.</td> </tr> <tr> @@ -954,7 +954,7 @@ asynchronous events from UNO oneway calls.</td> href="./OfficeDev/DesktopEnvironment/IShutdownListener.java" title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener</a></td> <td class="cell80">This is a listener interface to -clean up on shutdown of OpenOffice.org %PRODUCT_RELEASE%.</td> +clean up on shutdown of LibreOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><a @@ -985,7 +985,7 @@ get the window handle of the Java window.</td> href="./OfficeDev/DesktopEnvironment/OfficeConnect.java" title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of +LibreOffice %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of the application.</td> </tr> <tr> @@ -1016,7 +1016,7 @@ the application is registered as an event listener.</td> href="./OfficeDev/DesktopEnvironment/ViewContainer.java" title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer</a></td> <td class="cell80">Performs a clean up on the Java -side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> +side on LibreOffice %PRODUCT_RELEASE% shutdown.</td> </tr> </tbody> </table> @@ -1035,7 +1035,7 @@ side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> href="./OfficeDev/OfficeConnect.java" title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> +LibreOffice %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> </tr> <tr> <td class="cell20"><img @@ -1091,7 +1091,7 @@ TerminateListener and shows the use of them in a running program.</td> href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html" title="link to the reference documentation of com.sun.star.frame.XTerminationListener"> <code>XTerminateListener</code></a>. It is called -when OpenOffice.org %PRODUCT_RELEASE% terminates.</td> +when LibreOffice %PRODUCT_RELEASE% terminates.</td> </tr> </tbody> </table> @@ -1157,7 +1157,7 @@ of formats.</td> href="./OfficeDev/Linguistic/LinguisticExamples.java" title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples</a></td> <td class="cell80">A short example that uses most of -the functionality from the OpenOffice.org %PRODUCT_RELEASE% linguistic API.</td> +the functionality from the LibreOffice %PRODUCT_RELEASE% linguistic API.</td> </tr> <tr> <td class="cell20"><a @@ -1638,7 +1638,7 @@ URLs.</td> <td class="cell20"><a href="./Drawing/Helper.java" title="link to Drawing/Helper.java">Helper</a></td> <td class="cell80">Contains a helper class for the -other examples to connect to OpenOffice.org %PRODUCT_RELEASE% and open or create a drawing +other examples to connect to LibreOffice %PRODUCT_RELEASE% and open or create a drawing document.</td> </tr> <tr> @@ -1789,7 +1789,7 @@ is not implemented. To be more precise.</td> <td class="cell20"><a href="./Charts/Helper.java" title="link to Charts/Helper.java">Helper</a></td> <td class="cell80">Shows how to connect to -OpenOffice.org %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This +LibreOffice %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This class is used as a helper class for the other examples.</td> </tr> <tr> @@ -1844,7 +1844,7 @@ changes.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="BasicandDialogs">OpenOffice.org %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> + name="BasicandDialogs">LibreOffice %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> <td align="right"> <a href="#examples" title="link to the Developer's Guide examples overview"><img class="navigate" src="../../docs/images/nav_up.png"></a> <a @@ -1966,7 +1966,7 @@ the example. </td> href="./Database/CodeSamples.java" title="link to Database/CodeSamples.java">CodeSamples</a></td> <td class="cell80">Creates the connection to -OpenOffice.org %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> +LibreOffice %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> </tr> <tr> <td class="cell20"><img @@ -2649,7 +2649,7 @@ Management examples</a></td> href="./Config/ConfigExamples.java" title="link to Config/ConfigExamples.java">ConfigExamples</a></td> <td class="cell80">This example connects to a -OpenOffice.org %PRODUCT_RELEASE%, gets the configuration manager and accesses the +LibreOffice %PRODUCT_RELEASE%, gets the configuration manager and accesses the configuration in various ways.</td> </tr> </tbody> diff --git a/odk/examples/cpp/DocumentLoader/Makefile b/odk/examples/cpp/DocumentLoader/Makefile index 02a872a46fa2..488926254d59 100644 --- a/odk/examples/cpp/DocumentLoader/Makefile +++ b/odk/examples/cpp/DocumentLoader/Makefile @@ -94,7 +94,7 @@ CppDocumentLoaderExample : $(OUT_BIN)/DocumentLoader$(EXE_EXT) @echo $(SQM) $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=... @echo $(SQM) $(SQM)Before you can run this example you have to start your office in listening mode. @echo - - @echo $(SQM) $(SQM)soffice "$(QM)-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" + @echo $(SQM) $(SQM)soffice "$(QM)--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)" @echo -------------------------------------------------------------------------------- %.run: $(OUT_BIN)/DocumentLoader$(EXE_EXT) diff --git a/odk/examples/examples.html b/odk/examples/examples.html index cbc6732c012e..9271abeae940 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -443,7 +443,7 @@ running this program you should invoke the office with the following command: <blockquote> - <code>soffice "-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager"</code> + <code>soffice "--accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager"</code> </blockquote> You can also customize the mentioned host and port to your needs. </td> diff --git a/odk/index.html b/odk/index.html index f1baa8a40b83..de905cda3010 100644 --- a/odk/index.html +++ b/odk/index.html @@ -106,7 +106,7 @@ </tr> <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> - <td colspan="2"><a href="docs/cpp/ref/names/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td> + <td colspan="2"><a href="docs/cpp/ref/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td> <td class="content70">Reference documentation of the C++ UNO runtime and a set of C/C++ base and helper functions and classes to abstract from the system layer.</td> diff --git a/odk/index_online.html b/odk/index_online.html new file mode 100644 index 000000000000..3095527d55a0 --- /dev/null +++ b/odk/index_online.html @@ -0,0 +1,249 @@ +<html> +<head> + <title>LibreOffice API Documentation</title> + <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <link rel="shortcut icon" href="http://www.libreoffice.org/favicon.ico" /> +</head> +<body> +<div id="BgContainer"> + <div id="Container"> + <div id="TopHeader"> + <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a> + <p id="HeaderTagLine">LibreOffice API Documentation</p> + </div> + <div class="clear"></div> + <div id="Layout"> + <div class="typography"> + <h1>LibreOffice API Documentation</h1> +<table class="table1" cellpadding=0> + <tr> + <td><img class="nothing8" src="docs/images/nada.gif"></td> + <td> + <table class="table3"> + <tr> + <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="docs/install.html" title="link to the installation guide">Installation Guide</a></td> + <td class="content70">An overview of all necessary + installation steps (e.g. environment variables) to use LibreOffice SDK.</td> + </tr> + <tr valign="middle"> + <td><img class="nothing10" src="docs/images/nada.gif"></td> + <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td> + <td class="content70">Complete LibreOffice 3.5 API reference.</td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="docs/java/ref/index.html" title="link to the Java UNO runtime API reference documentation">Java UNO Runtime Reference </a></td> + <td class="content70">Reference documentation of the Java UNO runtime API.</td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="docs/cpp/ref/names/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td> + <td class="content70">Reference documentation of the C++ UNO runtime and a + set of C/C++ base and helper functions and classes to abstract from + the system layer.</td> + </tr> + <tr valign="middle"> + <td><img class="nothing10" src="docs/images/nada.gif"></td> + <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="docs/tools.html" title="link to the tools overview page">Development Tools</a></td> + <td class="content70">Overview and a short description of the UNO + development tools.</td> + </tr> + <tr valign="top"> + <td class="content4"><img src="docs/images/arrow-1.gif"></td> + <td colspan="2"><a href="examples/examples.html" title="link to the examples overview page">Examples</a></td> + <td class="content70">A collection of examples in different + programming languages (Java, Python, C++, Basic, OLE, CLI).</td> + </tr> + <tr valign="middle"> + <td><img class="nothing10" src="docs/images/nada.gif"></td> + <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td> + </tr> + <tr valign="top"> + <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td> + </tr> + <tr valign="middle"> + <td colspan="4"> <div id="cse" style="width: 100%;">Loading</div> +<script src="http://www.google.com/jsapi" type="text/javascript"></script> +<script type="text/javascript"> + google.load('search', '1', {language : 'en', style : google.loader.themes.GREENSKY}); + google.setOnLoadCallback(function() { + var customSearchControl = new google.search.CustomSearchControl('001034089959290472156:2nqofjbliw0'); + customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET); + customSearchControl.draw('cse'); + }, true); +</script> + <style type="text/css"> + .gsc-control-cse { + font-family: "Trebuchet MS", sans-serif; + border-color: #c2f6ba; + background-color: #c2f6ba; + } + input.gsc-input { + border-color: #18A303; + } + input.gsc-search-button { + border-color: #18A303; + background-color: #18A303; + } + .gsc-tabHeader.gsc-tabhInactive { + border-color: #c2f6ba; + background-color: #FFFFFF; + } + .gsc-tabHeader.gsc-tabhActive { + border-color: #c2f6ba; + background-color: #c2f6ba; + } + .gsc-tabsArea { + border-color: #c2f6ba; + } + .gsc-webResult.gsc-result, + .gsc-results .gsc-imageResult { + border-color: #c2f6ba; + background-color: #FFFFFF; + } + .gsc-webResult.gsc-result:hover, + .gsc-imageResult:hover { + border-color: #c2f6ba; + background-color: #FFFFFF; + } + .gs-webResult.gs-result a.gs-title:link, + .gs-webResult.gs-result a.gs-title:link b, + .gs-imageResult a.gs-title:link, + .gs-imageResult a.gs-title:link b { + color: #18A303; + } + .gs-webResult.gs-result a.gs-title:visited, + .gs-webResult.gs-result a.gs-title:visited b, + .gs-imageResult a.gs-title:visited, + .gs-imageResult a.gs-title:visited b { + color: #18A303; + } + .gs-webResult.gs-result a.gs-title:hover, + .gs-webResult.gs-result a.gs-title:hover b, + .gs-imageResult a.gs-title:hover, + .gs-imageResult a.gs-title:hover b { + color: #18A303; + } + .gs-webResult.gs-result a.gs-title:active, + .gs-webResult.gs-result a.gs-title:active b, + .gs-imageResult a.gs-title:active, + .gs-imageResult a.gs-title:active b { + color: #18A303; + } + .gsc-cursor-page { + color: #18A303; + } + a.gsc-trailing-more-results:link { + color: #18A303; + } + .gs-webResult .gs-snippet, + .gs-imageResult .gs-snippet { + color: #454545; + } + .gs-webResult div.gs-visibleUrl, + .gs-imageResult div.gs-visibleUrl { + color: #106802; + } + .gs-webResult div.gs-visibleUrl-short { + color: #106802; + } + .gs-webResult div.gs-visibleUrl-short { + display: none; + } + .gs-webResult div.gs-visibleUrl-long { + display: block; + } + .gsc-cursor-box { + border-color: #c2f6ba; + } + .gsc-results .gsc-cursor-box .gsc-cursor-page { + border-color: #c2f6ba; + background-color: #FFFFFF; + color: #18A303; + } + .gsc-results .gsc-cursor-box .gsc-cursor-current-page { + border-color: #c2f6ba; + background-color: #c2f6ba; + color: #18A303; + } + .gs-promotion { + border-color: #94CC7A; + background-color: #CBE8B4; + } + .gs-promotion a.gs-title:link, + .gs-promotion a.gs-title:link *, + .gs-promotion .gs-snippet a:link { + color: #0066CC; + } + .gs-promotion a.gs-title:visited, + .gs-promotion a.gs-title:visited *, + .gs-promotion .gs-snippet a:visited { + color: #0066CC; + } + .gs-promotion a.gs-title:hover, + .gs-promotion a.gs-title:hover *, + .gs-promotion .gs-snippet a:hover { + color: #0066CC; + } + .gs-promotion a.gs-title:active, + .gs-promotion a.gs-title:active *, + .gs-promotion .gs-snippet a:active { + color: #0066CC; + } + .gs-promotion .gs-snippet, + .gs-promotion .gs-title .gs-promotion-title-right, + .gs-promotion .gs-title .gs-promotion-title-right * { + color: #454545; + } + .gs-promotion .gs-visibleUrl, + .gs-promotion .gs-visibleUrl-short { + color: #815FA7; + } +</style> +</td> + </tr> + </table> + </td> + <td><img class="nothing8" src="docs/images/nada.gif"></td> + </tr> + </table> + </td> + </tr> +</table> + </div> + <div id="Footer"> + <div id="FooterText"> + <p> + Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved. + <br> + LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates. + <br> + The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>. + </p> + <p> + + </p> + <p> + <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a> + | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>. + </p> + </div> + </div> + </div> + </div> + </body> +</html> + diff --git a/odk/pack/gendocu/Doxyfile b/odk/pack/gendocu/Doxyfile new file mode 100644 index 000000000000..897462757723 --- /dev/null +++ b/odk/pack/gendocu/Doxyfile @@ -0,0 +1,51 @@ +## +## Version: MPL 1.1 / GPLv3+ / LGPLv3+ +## +## The contents of this file are subject to the Mozilla Public License Version +## 1.1 (the "License"); you may not use this file except in compliance with +## the License or as specified alternatively below. You may obtain a copy of +## the License at http://www.mozilla.org/MPL/ +## +## Software distributed under the License is distributed on an "AS IS" basis, +## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +## for the specific language governing rights and limitations under the +## License. +## +## Major Contributor(s): +## [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> +## (initial developer) ] +## +## All Rights Reserved. +## +## For minor contributions see the git repository. +## +## Alternatively, the contents of this file may be used under the terms of +## either the GNU General Public License Version 3 or later (the "GPLv3+"), or +## the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +## instead of those above. +## + +PROJECT_BRIEF = % +OUTPUT_DIRECTORY = % +STRIP_FROM_PATH = % +JAVADOC_AUTOBRIEF = YES + +EXTRACT_ALL = YES +CASE_SENSE_NAMES = NO + +QUIET = % +WARNINGS = YES +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" + +INPUT = % +RECURSIVE = YES + +HTML_OUTPUT = . + +GENERATE_LATEX = NO + +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +PREDEFINED = __cplusplus SAL_CALL= "SAL_THROW(x)=throw x" diff --git a/odk/pack/gendocu/main.dox b/odk/pack/gendocu/main.dox new file mode 100644 index 000000000000..718f639f9d90 --- /dev/null +++ b/odk/pack/gendocu/main.dox @@ -0,0 +1,31 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) ] + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +/// \mainpage +/// +/// This is a reference documentation for the C++ source code. diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 5f9f86aee25c..e4d8f869d693 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -68,38 +68,40 @@ JAVA_BEAN_SRC_FILES=\ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -AUTODOCPARAMS= -lg c++ \ - -p sal $(INCOUT) -t sal -t osl -t rtl \ - -p store $(INCOUT) -t store \ - -p registry $(INCOUT) -t registry \ - -p cppu $(INCOUT) -t cppu -t com -t typelib -t uno \ - -p cppuhelper $(INCOUT) -t cppuhelper \ - -p salhelper $(INCOUT) -t salhelper \ - -p bridges $(INCOUT) -t bridges - JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES) JAVADOCLOG = $(MISC)$/javadoc_log.txt -.IF "$(SOLAR_JAVA)"!="" -all: \ - $(CPP_DOCU_INDEX_FILE) \ - $(JAVA_DOCU_INDEX_FILE) +all : -.ELSE -all: $(CPP_DOCU_INDEX_FILE) -.ENDIF +.IF "$(DOXYGEN)" != "" +all : $(CPP_DOCU_INDEX_FILE) +.END +.IF "$(SOLAR_JAVA)" != "" +all : $(JAVA_DOCU_INDEX_FILE) +.END -$(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIST) $(PRJ)$/docs$/cpp$/ref$/cpp.css +$(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIST) Doxyfile main.dox @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENCPPREF) $(TOUCH) $@ -$(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG) - -$(MKDIRHIER) $(@:d) - $(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS) - -rm $(@:d:d)$/cpp.css - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css +.IF "$(VERBOSE)" == "TRUE" +MY_QUIET = NO +.ELSE +MY_QUIET = YES +.END + +$(CPP_DOCU_INDEX_FILE) .ERRREMOVE : $(CPP_DOCU_CLEANUP_FLAG) + -$(MKDIRHIER) $(@:d) + $(SED) \ + -e 's!^INPUT = %$$!INPUT = main.dox $(INCLUDETOPDIRLIST) $(INCLUDEFILELIST)!' \ + -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DESTDIRGENCPPREF)!' \ + -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \ + -e 's!^QUIET = %$$!QUIET = $(MY_QUIET)!' \ + -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(SOLARINCDIR)!' \ + Doxyfile > $(MISC)/Doxyfile + $(DOXYGEN) $(MISC)/Doxyfile $(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f) -$(MKDIRHIER) $(@:d) diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 949ece7f3686..797d12300d2d 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -207,7 +207,6 @@ LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text -nor ifeq ($(OO_SDK_CC_55_OR_HIGHER),) LIBRARY_LINK_FLAGS+=-instances=static endif -#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs @@ -330,10 +329,6 @@ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE -# define for used compiler necessary for UNO -#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -#-DCPPU_ENV=gcc3 -- gcc3 3.0 - CC_OUTPUT_SWITCH=-o LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' @@ -341,7 +336,6 @@ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' ifeq "$(PROCTYPE)" "ppc" LIBRARY_LINK_FLAGS+=-fPIC endif -#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive @@ -459,16 +453,13 @@ CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_ CC_OUTPUT_SWITCH=-o LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION) -#-fPIC -fno-common # install_name '@executable_path$/(@:f)' -#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,-exported_symbols_list $(COMP_MAPFILE) COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-framework JavaVM -#LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries" ifneq "$(OO_SDK_URE_HOME)" "" URE_MISC=$(OO_SDK_URE_HOME)/share/misc @@ -576,7 +567,6 @@ CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK CC_OUTPUT_SWITCH=-o LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -#COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 07266311ca40..705b5289d335 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) -OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)" -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)" +OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb) OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" diff --git a/odk/util/check.pl b/odk/util/check.pl index 490210c382b8..7811635067e1 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -174,126 +174,18 @@ if (-d "$StartDir") { #check cpp docu, it is only a first and simple check # improvement required - print "check cpp docu: "; - if (-d "$StartDir/docs/cpp/ref") { - if (! -e "$StartDir/docs/cpp/ref/index.html") { - print "\nERROR: \"$StartDir/docs/cpp/ref/index.html\" is missing\n"; - $return++; - } - if (! -d "$StartDir/docs/cpp/ref/index-files") { - print "\nERROR: \"$StartDir/docs/cpp/ref/index-files\" is missing\n"; - $return++; - } - if (! -e "$StartDir/docs/cpp/ref/index-files/index-10.html") { - print "\nERROR: \"$StartDir/docs/cpp/ref/index-files/index-10.html\" is missing\n"; - $return++; - } - - my @dir_list = ( "com","com/sun","com/sun/star","com/sun/star/uno", - "com/sun/star/uno/Any","com/sun/star/uno/Type", - "com/sun/star/uno/Array","com/sun/star/uno/WeakReferenceHelper", - "com/sun/star/uno/Reference","com/sun/star/uno/WeakReference", - "com/sun/star/uno/Environment","com/sun/star/uno/Sequence", - "com/sun/star/uno/BaseReference","com/sun/star/uno/Mapping", - "com/sun/star/uno/ContextLayer","com/sun/star/uno/TypeDescription", - "osl","osl/File","osl/Pipe","osl/FileStatus","osl/FileBase", - "osl/Guard","osl/Mutex","osl/VolumeInfo","osl/GetGlobalMutex", - "osl/Security","osl/Profile","osl/DatagramSocket","osl/SocketAddr", - "osl/StreamPipe","osl/ResettableGuard","osl/AcceptorSocket", - "osl/ClearableGuard","osl/VolumeDevice","rtl","rtl/Uri","rtl/math", - "rtl/OUStringHash","rtl/MalformedUriException","rtl/OUStringBuffer", - "rtl/OUString","rtl/Reference","rtl/ByteSequence","rtl/OLocale", - "rtl/Logfile","rtl/OString","rtl/IReference","rtl/OStringBuffer", - "rtl/OStringHash","_typelib_CompoundTypeDescription","cppu", - "cppu/ContextEntry_Init","cppu/ImplInheritanceHelper10", - "cppu/ImplInheritanceHelper11","cppu/ImplInheritanceHelper12", - "cppu/WeakAggImplHelper1","cppu/WeakAggImplHelper2", - "cppu/WeakAggImplHelper3","cppu/WeakAggImplHelper4", - "cppu/WeakAggImplHelper5","cppu/WeakAggImplHelper6", - "cppu/WeakAggImplHelper7","cppu/WeakAggImplHelper8", - "cppu/WeakAggImplHelper9", - "cppu/OMultiTypeInterfaceContainerHelperInt32","cppu/AccessControl", - "cppu/OPropertyArrayHelper","cppu/ImplHelper1","cppu/ImplHelper2", - "cppu/ImplHelper3","cppu/ImplHelper4","cppu/ImplHelper5", - "cppu/ImplHelper6","cppu/ImplHelper7","cppu/ImplHelper8", - "cppu/ImplHelper9","cppu/WeakComponentImplHelper10", - "cppu/WeakComponentImplHelper11","cppu/WeakComponentImplHelper12", - "cppu/UnoUrl","cppu/WeakComponentImplHelper1", - "cppu/WeakComponentImplHelper2","cppu/WeakComponentImplHelper3", - "cppu/WeakComponentImplHelper4","cppu/WeakComponentImplHelper5", - "cppu/WeakComponentImplHelper6","cppu/WeakComponentImplHelper7", - "cppu/WeakComponentImplHelper8","cppu/WeakComponentImplHelper9", - "cppu/OInterfaceIteratorHelper", - "cppu/OMultiTypeInterfaceContainerHelper","cppu/UnoUrlDescriptor", - "cppu/IPropertyArrayHelper","cppu/OBroadcastHelperVar", - "cppu/OComponentHelper","cppu/OWeakAggObject", - "cppu/ImplementationEntry","cppu/WeakImplHelper10", - "cppu/WeakImplHelper11","cppu/WeakImplHelper12", - "cppu/OPropertySetHelper","cppu/ImplHelper10","cppu/ImplHelper11", - "cppu/ImplHelper12","cppu/WeakAggImplHelper10", - "cppu/WeakAggImplHelper11","cppu/WeakAggImplHelper12", - "cppu/ImplInheritanceHelper1","cppu/ImplInheritanceHelper2", - "cppu/ImplInheritanceHelper3","cppu/ImplInheritanceHelper4", - "cppu/ImplInheritanceHelper5","cppu/ImplInheritanceHelper6", - "cppu/ImplInheritanceHelper7","cppu/ImplInheritanceHelper8", - "cppu/ImplInheritanceHelper9","cppu/OTypeCollection", - "cppu/WeakAggComponentImplHelper10", - "cppu/WeakAggComponentImplHelper11", - "cppu/WeakAggComponentImplHelper12", - "cppu/WeakAggComponentImplHelper1", - "cppu/WeakAggComponentImplHelper2", - "cppu/WeakAggComponentImplHelper3", - "cppu/WeakAggComponentImplHelper4", - "cppu/WeakAggComponentImplHelper5", - "cppu/WeakAggComponentImplHelper6", - "cppu/WeakAggComponentImplHelper7", - "cppu/WeakAggComponentImplHelper8", - "cppu/WeakAggComponentImplHelper9", - "cppu/OMultiTypeInterfaceContainerHelperVar", - "cppu/OInterfaceContainerHelper","cppu/OImplementationId", - "cppu/AggImplInheritanceHelper1","cppu/AggImplInheritanceHelper2", - "cppu/AggImplInheritanceHelper3","cppu/AggImplInheritanceHelper4", - "cppu/AggImplInheritanceHelper5","cppu/AggImplInheritanceHelper6", - "cppu/AggImplInheritanceHelper7","cppu/AggImplInheritanceHelper8", - "cppu/AggImplInheritanceHelper9","cppu/AggImplInheritanceHelper10", - "cppu/AggImplInheritanceHelper11","cppu/AggImplInheritanceHelper12", - "cppu/WeakImplHelper1","cppu/WeakImplHelper2","cppu/WeakImplHelper3", - "cppu/WeakImplHelper4","cppu/WeakImplHelper5","cppu/WeakImplHelper6", - "cppu/WeakImplHelper7","cppu/WeakImplHelper8","cppu/WeakImplHelper9", - "cppu/OWeakObject","__store_FindData","_rtl_StandardModuleCount", - "RTUik","RTConstValue","_typelib_TypeDescriptionReference", - "_typelib_InterfaceMethodTypeDescription","store","RegistryKey", - "_typelib_Union_Init","_sal_Sequence","_typelib_Parameter_Init", - "_typelib_TypeDescription","_uno_Environment", - "_typelib_InterfaceAttributeTypeDescription", - "_rtl_ModuleCount","_uno_ExtEnvironment", - "_typelib_IndirectTypeDescription", - "Registry_Api","_oslFileStatus", - "_typelib_InterfaceMemberTypeDescription","RegistryValueList", - "RegistryTypeWriter_Api","_rtl_TextEncodingInfo", - "namespace_anonymous_1", - "_oslVolumeInfo","_uno_Interface", - "_typelib_InterfaceTypeDescription","_uno_Mapping","Registry", - "RegistryTypeReader_Api","_typelib_Uik", - "_typelib_ArrayTypeDescription", - "RegistryKeyArray","RegistryTypeReader","RegistryKeyNames", - "RTConstValueUnion","_typelib_UnionTypeDescription","_uno_Any", - "RegistryTypeWriter","_rtl_Locale","_typelib_CompoundMember_Init", - "_typelib_EnumTypeDescription","_typelib_MethodParameter"); - - foreach $i (@dir_list) - { - if (! -d "$StartDir/docs/cpp/ref/names/$i") { - $return++; - print "\nERROR: \"$StartDir/docs/cpp/ref/names/$i\" is missing\n"; + if ($ENV{'DOXYGEN'} ne '') { + print "check cpp docu: "; + if (-d "$StartDir/docs/cpp/ref") { + if (! -e "$StartDir/docs/cpp/ref/index.html") { + print "\nERROR: \"$StartDir/docs/cpp/ref/index.html\" is missing\n"; + $return++; + } } else { - print "+"; + $return++; } + print "\n"; } - } else { - $return++; - } - print "\n"; #check java docu, it is only a first and simple check # improvement required |