The Palette subclasses don't need to be public

Change-Id: I40f942c202ab3ba1ca13d1b24d0cd72a4c561868

include/svx/Palette.hxx

@@ -24,10 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
 
-class SvFileStream;
-
 typedef std::pair<Color, OUString> NamedColor;
-typedef std::vector< NamedColor > ColorList;
 
 class SVX_DLLPUBLIC Palette
 {
@@ -41,71 +38,6 @@ public:
     virtual bool                IsValid() = 0;
 };
 
-// ASE = Adobe Swatch Exchange
-
-class SVX_DLLPUBLIC PaletteASE : public Palette
-{
-    bool        mbValidPalette;
-    OUString    maFPath;
-    OUString    maASEPaletteName;
-    ColorList   maColors;
-
-    void        LoadPalette();
-public:
-    PaletteASE( const OUString &rFPath, const OUString &rFName );
-    virtual ~PaletteASE() override;
-
-    virtual const OUString&     GetName() override;
-    virtual const OUString&     GetPath() override;
-    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
-
-    virtual bool                IsValid() override;
-};
-
-// GPL - this is *not* GNU Public License, but is the Gimp PaLette
-
-class SVX_DLLPUBLIC PaletteGPL : public Palette
-{
-    bool        mbLoadedPalette;
-    bool        mbValidPalette;
-    OUString    maFName;
-    OUString    maFPath;
-    OUString    maGPLPaletteName;
-    ColorList   maColors;
-
-    bool        ReadPaletteHeader(SvFileStream& rFileStream);
-    void        LoadPaletteHeader();
-    void        LoadPalette();
-public:
-    PaletteGPL( const OUString &rFPath, const OUString &rFName );
-    virtual ~PaletteGPL() override;
-
-    virtual const OUString&     GetName() override;
-    virtual const OUString&     GetPath() override;
-    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
-
-    virtual bool                IsValid() override;
-};
-
-// SOC - Star Office Color-table
-
-class SVX_DLLPUBLIC PaletteSOC : public Palette
-{
-    bool            mbLoadedPalette;
-    OUString        maFPath;
-    OUString        maSOCPaletteName;
-    XColorListRef   mpColorList;
-public:
-    PaletteSOC( const OUString &rFPath, const OUString &rFName );
-    virtual ~PaletteSOC() override;
-
-    virtual const OUString&     GetName() override;
-    virtual const OUString&     GetPath() override;
-    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
-
-    virtual bool                IsValid() override;
-};
-
 #endif // INCLUDED_SVX_PALETTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svx/inc/palettes.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 INCLUDED_SVX_INC_PALETTE_HXX
+#define INCLUDED_SVX_INC_PALETTE_HXX
+
+#include <svx/Palette.hxx>
+
+class SvFileStream;
+
+typedef std::vector< NamedColor > ColorList;
+
+// ASE = Adobe Swatch Exchange
+
+class SVX_DLLPUBLIC PaletteASE : public Palette
+{
+    bool        mbValidPalette;
+    OUString    maFPath;
+    OUString    maASEPaletteName;
+    ColorList   maColors;
+
+    void        LoadPalette();
+public:
+    PaletteASE( const OUString &rFPath, const OUString &rFName );
+    virtual ~PaletteASE() override;
+
+    virtual const OUString&     GetName() override;
+    virtual const OUString&     GetPath() override;
+    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
+
+    virtual bool                IsValid() override;
+};
+
+// GPL - this is *not* GNU Public License, but is the Gimp PaLette
+
+class SVX_DLLPUBLIC PaletteGPL : public Palette
+{
+    bool        mbLoadedPalette;
+    bool        mbValidPalette;
+    OUString    maFName;
+    OUString    maFPath;
+    OUString    maGPLPaletteName;
+    ColorList   maColors;
+
+    bool        ReadPaletteHeader(SvFileStream& rFileStream);
+    void        LoadPaletteHeader();
+    void        LoadPalette();
+public:
+    PaletteGPL( const OUString &rFPath, const OUString &rFName );
+    virtual ~PaletteGPL() override;
+
+    virtual const OUString&     GetName() override;
+    virtual const OUString&     GetPath() override;
+    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
+
+    virtual bool                IsValid() override;
+};
+
+// SOC - Star Office Color-table
+
+class SVX_DLLPUBLIC PaletteSOC : public Palette
+{
+    bool            mbLoadedPalette;
+    OUString        maFPath;
+    OUString        maSOCPaletteName;
+    XColorListRef   mpColorList;
+public:
+    PaletteSOC( const OUString &rFPath, const OUString &rFName );
+    virtual ~PaletteSOC() override;
+
+    virtual const OUString&     GetName() override;
+    virtual const OUString&     GetPath() override;
+    virtual void                LoadColorSet( SvxColorValueSet& rColorSet ) override;
+
+    virtual bool                IsValid() override;
+};
+
+#endif // INCLUDED_SVX_INC_PALETTE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svx/source/tbxctrls/Palette.cxx

@@ -20,6 +20,7 @@
 #include <svx/Palette.hxx>
 #include <tools/stream.hxx>
 
+#include "palettes.hxx"
 
 Palette::~Palette()
 {

svx/source/tbxctrls/PaletteManager.cxx

@@ -33,6 +33,8 @@
 #include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
 
+#include "palettes.hxx"
+
 PaletteManager::PaletteManager() :
     mnMaxRecentColors(Application::GetSettings().GetStyleSettings().GetColorValueSetColumnCount()),
     mnNumOfPalettes(2),