diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 09:40:33 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-21 09:40:33 +0000 |
commit | b5f607a4aa5c622efba748a1d443131dbee38ad0 (patch) | |
tree | 08eb9e8cb10f352418b2439e28cd16850f088b5d | |
parent | 5ce9606a669d451b71c9c0e1da33bb62007d8aae (diff) |
callcatcher: update unused code
Change-Id: I225cbb3a4a66a8f20bec91c4770ad78e72b663b1
-rw-r--r-- | include/svx/sdr/overlay/overlaytriangle.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 42 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hxx | 3 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaytriangle.cxx | 24 | ||||
-rw-r--r-- | unusedcode.easy | 1 | ||||
-rw-r--r-- | vcl/inc/opengl/program.hxx | 1 | ||||
-rw-r--r-- | vcl/opengl/program.cxx | 6 |
7 files changed, 2 insertions, 81 deletions
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index b2ae411feed7..da7567e078f6 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -44,13 +44,11 @@ namespace sdr Color aTriangleColor); virtual ~OverlayTriangle(); - // change second position + // get second position const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } - void setSecondPosition(const basegfx::B2DPoint& rNew); - // change third position + // get third position const basegfx::B2DPoint& getThirdPosition() const { return maThirdPosition; } - void setThirdPosition(const basegfx::B2DPoint& rNew); }; } // end of namespace overlay } // end of namespace sdr diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 287fccc01345..1b3e13ac1d16 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -110,48 +110,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi ScCalcOptionsDialog::~ScCalcOptionsDialog() {} -#if HAVE_FEATURE_OPENCL - -void ScCalcOptionsDialog::fillOpenCLList() -{ - mpOpenclInfoList->SetUpdateMode(false); - mpOpenclInfoList->Clear(); - SvTreeListEntry* pSoftwareEntry = mpOpenclInfoList->InsertEntry(maSoftware); - - OUString aStoredDevice = maConfig.maOpenCLDevice; - - SvTreeListEntry* pSelectedEntry = NULL; - - sc::FormulaGroupInterpreter::fillOpenCLInfo(maPlatformInfo); - for(std::vector<OpenCLPlatformInfo>::iterator it = maPlatformInfo.begin(), - itEnd = maPlatformInfo.end(); it != itEnd; ++it) - { - for(std::vector<OpenCLDeviceInfo>::iterator - itr = it->maDevices.begin(), itrEnd = it->maDevices.end(); itr != itrEnd; ++itr) - { - OUString aDeviceId = it->maVendor + " " + itr->maName + " " + itr->maDriver; - SvTreeListEntry* pEntry = mpOpenclInfoList->InsertEntry(aDeviceId); - if(aDeviceId == aStoredDevice) - { - pSelectedEntry = pEntry; - } - pEntry->SetUserData(&(*itr)); - } - } - - mpOpenclInfoList->SetUpdateMode(true); - mpOpenclInfoList->GetModel()->GetView(0)->SelectAll(false, false); - - if (pSelectedEntry) - mpOpenclInfoList->Select(pSelectedEntry); - else if (aStoredDevice == OPENCL_SOFTWARE_DEVICE_CONFIG_NAME) - mpOpenclInfoList->Select(pSoftwareEntry); - - SelectedDeviceChanged(); -} - -#endif - void ScCalcOptionsDialog::OpenCLAutomaticSelectionChanged() { bool bValue = mpBtnAutomaticSelectionTrue->IsChecked(); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 61c5c43d136f..08fad6cf17c3 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -53,9 +53,6 @@ public: private: void OpenCLAutomaticSelectionChanged(); void SelectedDeviceChanged(); -#if HAVE_FEATURE_OPENCL - void fillOpenCLList(); -#endif SvTreeListEntry *createItem(const OUString &rCaption, const OUString& sValue) const; void setValueAt(size_t nPos, const OUString &rString); diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 52a3cb7c351c..1785ce8fde30 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -65,30 +65,6 @@ namespace sdr { } - void OverlayTriangle::setSecondPosition(const basegfx::B2DPoint& rNew) - { - if(rNew != maSecondPosition) - { - // remember new value - maSecondPosition = rNew; - - // register change (after change) - objectChange(); - } - } - - void OverlayTriangle::setThirdPosition(const basegfx::B2DPoint& rNew) - { - if(rNew != maThirdPosition) - { - // remember new value - maThirdPosition = rNew; - - // register change (after change) - objectChange(); - } - } - } // end of namespace overlay } // end of namespace sdr diff --git a/unusedcode.easy b/unusedcode.easy index 68004b9246ba..6fa37f56aa28 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,4 @@ BigInt::BigInt(unsigned int) -CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) FontCharMap::GetDefaultMap(bool) OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int) OpenGLContext::renderToFile() diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 8fc74d203d45..f904984ff362 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -56,7 +56,6 @@ public: void SetUniform1fv( const OString& rName, GLsizei nCount, GLfloat* aValues ); void SetUniform2fv( const OString& rName, GLsizei nCount, GLfloat* aValues ); void SetUniform1i( const OString& rName, GLint v1 ); - void SetUniform1iv( const OString& rName, GLsizei nCount, GLint* aValues ); void SetColor( const OString& rName, const Color& rColor ); void SetColor( const OString& rName, SalColor nColor, sal_uInt8 nTransparency ); void SetColorf( const OString& rName, SalColor nColor, double fTransparency ); diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index d3a192c974cb..cdf81314ecc5 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -154,12 +154,6 @@ void OpenGLProgram::SetUniform1i( const OString& rName, GLint v1 ) glUniform1i( nUniform, v1 ); } -void OpenGLProgram::SetUniform1iv( const OString& rName, GLsizei nCount, GLint* aValues ) -{ - GLuint nUniform = GetUniformLocation( rName ); - glUniform1iv( nUniform, nCount, aValues ); -} - void OpenGLProgram::SetColor( const OString& rName, SalColor nColor, sal_uInt8 nTransparency ) { GLuint nUniform = GetUniformLocation( rName ); |