ucb/prj/d.lst | 2 - ucb/source/ucp/cmis/makefile.mk | 8 +++---- ucb/source/ucp/cmis/ucpcmis.component | 34 --------------------------------- ucb/source/ucp/cmis/ucpcmis1.component | 34 +++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 39 deletions(-)
New commits: commit 2d5ce4cfcc0ec5d6ac61a085c8226bcd31c572e8 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Oct 5 14:26:40 2011 +0200 Deliver the right thing diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst index 1351c77..080d900 100644 --- a/ucb/prj/d.lst +++ b/ucb/prj/d.lst @@ -40,7 +40,7 @@ ..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml\ucpgvfs.component ..\%__SRC%\misc\ucpgio.component %_DEST%\xml\ucpgio.component -..\%__SRC%\misc\ucpcmis.component %_DEST%\xml\ucpcmis.component +..\%__SRC%\misc\ucpcmis1.component %_DEST%\xml\ucpcmis1.component ..\%__SRC%\misc\cached1.component %_DEST%\xml\cached1.component ..\%__SRC%\misc\srtrs1.component %_DEST%\xml\srtrs1.component ..\%__SRC%\misc\ucb1.component %_DEST%\xml\ucb1.component diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk index 08ffa6f..ebaf703 100644 --- a/ucb/source/ucp/cmis/makefile.mk +++ b/ucb/source/ucp/cmis/makefile.mk @@ -81,10 +81,10 @@ DEF1NAME = $(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/ucpcmis.component +ALLTAR : $(MISC)/ucpcmis1.component -$(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpcmis.component +$(MISC)/ucpcmis1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + ucpcmis1.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpcmis.component + $(SOLARENV)/bin/createcomponent.xslt ucpcmis1.component diff --git a/ucb/source/ucp/cmis/ucpcmis.component b/ucb/source/ucp/cmis/ucpcmis.component deleted file mode 100644 index 0d61780..0000000 --- a/ucb/source/ucp/cmis/ucpcmis.component +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--********************************************************************** - * 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) 2011 SUSE <cbosdon...@suse.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. -**********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.CmisContentProvider"> - <service name="com.sun.star.ucb.CmisContentProvider"/> - </implementation> -</component> diff --git a/ucb/source/ucp/cmis/ucpcmis1.component b/ucb/source/ucp/cmis/ucpcmis1.component new file mode 100644 index 0000000..0d61780 --- /dev/null +++ b/ucb/source/ucp/cmis/ucpcmis1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** + * 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) 2011 SUSE <cbosdon...@suse.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. +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.CmisContentProvider"> + <service name="com.sun.star.ucb.CmisContentProvider"/> + </implementation> +</component>
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits