[Libreoffice-commits] .: xmloff/Library_xo.mk xmloff/source

Caolán McNamara caolan at kemper.freedesktop.org
Mon Aug 22 04:06:53 PDT 2011


 xmloff/Library_xo.mk               |    1 
 xmloff/source/draw/viewcontext.cxx |   90 -------------------------------------
 xmloff/source/draw/viewcontext.hxx |   54 ----------------------
 3 files changed, 145 deletions(-)

New commits:
commit 77289a32ca688d51a8579b89c4b180c4fed2530f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 22 11:49:17 2011 +0100

    entire source file and header can go

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 6e7bf1a..95c2d33 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -148,7 +148,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/draw/shapeexport3 \
     xmloff/source/draw/shapeexport4 \
     xmloff/source/draw/shapeimport \
-    xmloff/source/draw/viewcontext \
     xmloff/source/draw/xexptran \
     xmloff/source/draw/ximp3dobject \
     xmloff/source/draw/ximp3dscene \
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
deleted file mode 100644
index 3309635..0000000
--- a/xmloff/source/draw/viewcontext.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_xmloff.hxx"
-#include "viewcontext.hxx"
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/xmltoken.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include <xmloff/nmspmap.hxx>
-#include "xmloff/VisAreaContext.hxx"
-
-using namespace com::sun::star;
-using ::xmloff::token::IsXMLToken;
-
-using ::xmloff::token::XML_EMBEDDED_VISIBLE_AREA;
-
-using ::rtl::OUString;
-
-//------------------------------------------------------------------
-
-SdXMLViewSettingsContext::~SdXMLViewSettingsContext()
-{
-}
-
-SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
-                                     const OUString& rLocalName,
-                                     const ::com::sun::star::uno::Reference<
-                                          ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
-{
-    SvXMLImportContext *pContext = 0;
-
-    if (nPrefix == XML_NAMESPACE_OFFICE)
-    {
-        if ( IsXMLToken( rLocalName, XML_EMBEDDED_VISIBLE_AREA ) )
-        {
-            sal_Int16 nMeasureUnit = 0;
-
-            uno::Reference< beans::XPropertySet > xProps( GetImport().GetModel(), uno::UNO_QUERY );
-            if( xProps.is() )
-                xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MapUnit" ) ) ) >>= nMeasureUnit;
-
-            pContext = new XMLVisAreaContext(GetImport(), nPrefix, rLocalName, xAttrList, maVisArea, nMeasureUnit);
-        }
-    }
-
-    if( !pContext )
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
-    return pContext;
-}
-
-void SdXMLViewSettingsContext::EndElement()
-{
-    uno::Reference< beans::XPropertySet > xProps( GetImport().GetModel(), uno::UNO_QUERY );
-    if( xProps.is() )
-    {
-        uno::Any aAny;
-        aAny <<= maVisArea;
-
-        xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), aAny );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
deleted file mode 100644
index 8fc86f6..0000000
--- a/xmloff/source/draw/viewcontext.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SD_XMLVIEWSETTINGSCONTEXT_HXX
-#define _SD_XMLVIEWSETTINGSCONTEXT_HXX
-
-
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <xmloff/xmlictxt.hxx>
-
-class SdXMLImport;
-
-class SdXMLViewSettingsContext : public SvXMLImportContext
-{
-    ::com::sun::star::awt::Rectangle maVisArea;
-
-public:
-    virtual ~SdXMLViewSettingsContext();
-
-    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
-                                                    const rtl::OUString& rLocalName,
-                                                    const ::com::sun::star::uno::Reference<
-                                          ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-    virtual void EndElement();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list