diff options
Diffstat (limited to 'vcl/inc/sallayout.hxx')
-rw-r--r-- | vcl/inc/sallayout.hxx | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 7ed0c935abf8..711e994341c9 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -1,41 +1,28 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #ifndef _SV_SALLAYOUT_HXX #define _SV_SALLAYOUT_HXX #include <tools/gen.hxx> - #include <vector> -namespace basegfx { - class B2DPolyPolygon; - typedef std::vector<B2DPolyPolygon> B2DPolyPolygonVector; -} +#include <basegfx/polygon/b2dpolypolygon.hxx> #ifndef _TOOLS_LANG_HXX typedef unsigned short LanguageType; @@ -105,7 +92,7 @@ public: int mnLength; int mnMinCharPos; int mnEndCharPos; - const xub_Unicode* mpStr; + const sal_Unicode* mpStr; // positioning related inputs const sal_Int32* mpDXArray; // in pixel units @@ -117,7 +104,7 @@ public: ImplLayoutRuns maReruns; public: - ImplLayoutArgs( const xub_Unicode* pStr, int nLength, + ImplLayoutArgs( const sal_Unicode* pStr, int nLength, int nMinCharPos, int nEndCharPos, int nFlags ); void SetLayoutWidth( long nWidth ) { mnLayoutWidth = nWidth; } |